diff --git a/cleanup.sh b/cleanup.sh
new file mode 100755
index 000000000..627a3b3ed
--- /dev/null
+++ b/cleanup.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+rm -rf build dist *.egg-info
+find . -name '*.pyc' -delete
+find . -name '*.log' -delete
diff --git a/container_service_extension/broker.py b/container_service_extension/broker.py
index 8f1645906..58899f06a 100644
--- a/container_service_extension/broker.py
+++ b/container_service_extension/broker.py
@@ -1,9 +1,19 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 import click
+
+from container_service_extension.cluster import add_nodes
+from container_service_extension.cluster import get_master_ip
+from container_service_extension.cluster import init_cluster
+from container_service_extension.cluster import join_cluster
 from container_service_extension.cluster import load_from_metadata
+from container_service_extension.cluster import TYPE_MASTER
+from container_service_extension.cluster import TYPE_NODE
+
 import logging
+
 import pkg_resources
+
 from pyvcloud.vcd.client import _WellKnownEndpoint
 from pyvcloud.vcd.client import BasicLoginCredentials
 from pyvcloud.vcd.client import Client
@@ -12,10 +22,10 @@
 from pyvcloud.vcd.task import Task
 from pyvcloud.vcd.vapp import VApp
 from pyvcloud.vcd.vdc import VDC
+
 import re
 import requests
 import threading
-import time
 import traceback
 import uuid
 import yaml
@@ -39,6 +49,8 @@
 
 SAMPLE_TEMPLATE_PHOTON_V1 = {
     'name':
+    'photon-v1',
+    'catalog_item':
     'photon-custom-hw11-1.0-62c543d-k8s',
     'source_ova_name':
     'photon-custom-hw11-1.0-62c543d.ova',
@@ -55,11 +67,15 @@
     'mem':
     2048,
     'admin_password':
-    'guest_os_admin_password'
+    'guest_os_admin_password',
+    'description':
+    "PhotonOS v1\nDocker 17.06.0-1\nKubernetes 1.8.1\nweave 2.0.5"
 }
 
 SAMPLE_TEMPLATE_UBUNTU_16_04 = {
     'name':
+    'ubuntu-16.04',
+    'catalog_item':
     'ubuntu-16.04-server-cloudimg-amd64-k8s',
     'source_ova_name':
     'ubuntu-16.04-server-cloudimg-amd64.ova',
@@ -76,7 +92,9 @@
     'mem':
     2048,
     'admin_password':
-    'guest_os_admin_password'
+    'guest_os_admin_password',
+    'description':
+    'Ubuntu 16.04\nDocker 17.09.0~ce\nKubernetes 1.8.2\nweave 2.0.5'
 }
 
 SAMPLE_CONFIG = {
@@ -115,7 +133,7 @@ def validate_broker_config_elements(config):
                 raise Exception('invalid key: %s' % k)
 
 
-def validate_broker_config_content(config, client):
+def validate_broker_config_content(config, client, template):
     from container_service_extension.config import bool_to_msg
     logged_in_org = client.get_org()
     org = Org(client, resource=logged_in_org)
@@ -123,17 +141,19 @@ def validate_broker_config_content(config, client):
     click.echo('Find catalog \'%s\': %s' % (config['broker']['catalog'],
                                             bool_to_msg(True)))
     default_template_found = False
-    for template in config['broker']['templates']:
-        click.secho('Validating template: %s' % template['name'])
-        if config['broker']['default_template'] == template['name']:
-            default_template_found = True
-            click.secho('  Is default template: %s' % True)
-        else:
-            click.secho('  Is default template: %s' % False)
-        org.get_catalog_item(config['broker']['catalog'], template['name'])
-        click.echo('Find template \'%s\', \'%s\': %s' %
-                   (config['broker']['catalog'], template['name'],
-                    bool_to_msg(True)))
+    for t in config['broker']['templates']:
+        if template == '*' or template == t['name']:
+            click.secho('Validating template: %s' % t['name'])
+            if config['broker']['default_template'] == t['name']:
+                default_template_found = True
+                click.secho('  Is default template: %s' % True)
+            else:
+                click.secho('  Is default template: %s' % False)
+            org.get_catalog_item(config['broker']['catalog'],
+                                 t['catalog_item'])
+            click.echo('Find template \'%s\', \'%s\': %s' %
+                       (config['broker']['catalog'], t['catalog_item'],
+                        bool_to_msg(True)))
 
     assert default_template_found
 
@@ -145,22 +165,6 @@ def get_new_broker(config):
         return None
 
 
-def wait_until_tools_ready(vm):
-    while True:
-        try:
-            status = vm.guest.toolsRunningStatus
-            if 'guestToolsRunning' == status:
-                LOGGER.debug('vm tools %s are ready' % vm)
-                return
-            LOGGER.debug('waiting for vm tools %s to be ready (%s)' % (vm,
-                                                                       status))
-            time.sleep(1)
-        except Exception:
-            LOGGER.debug('waiting for vm tools %s to be ready (%s)* ' %
-                         (vm, status))
-            time.sleep(1)
-
-
 def spinning_cursor():
     while True:
         for cursor in '|/-\\':
@@ -247,8 +251,8 @@ def update_task(self, status, operation, message=None, error_message=None):
         self.t = self.task.update(
             status.value,
             'vcloud.cse',
-            operation,
             message,
+            operation,
             '',
             None,
             'urn:cse:cluster:%s' % self.cluster_id,
@@ -271,6 +275,16 @@ def is_valid_name(self, name):
         allowed = re.compile("(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE)
         return all(allowed.match(x) for x in name.split("."))
 
+    def get_template(self):
+        if 'template' in self.body and self.body['template'] is not None:
+            name = self.body['template']
+        else:
+            name = self.config['broker']['default_template']
+        for template in self.config['broker']['templates']:
+            if template['name'] == name:
+                return template
+        raise Exception('Template %s not found' % name)
+
     def run(self):
         LOGGER.debug('thread started op=%s' % self.op)
         if self.op == OP_CREATE_CLUSTER:
@@ -344,6 +358,11 @@ def create_cluster_thread(self):
             org = Org(self.client_tenant, resource=org_resource)
             vdc_resource = org.get_vdc(self.body['vdc'])
             vdc = VDC(self.client_tenant, resource=vdc_resource)
+            self.update_task(
+                TaskStatus.RUNNING,
+                self.op,
+                message='Creating cluster vApp %s(%s)' % (self.cluster_name,
+                                                          self.cluster_id))
             vapp_resource = vdc.create_vapp(
                 self.cluster_name,
                 description='cluster %s' % self.cluster_name,
@@ -359,6 +378,7 @@ def create_cluster_thread(self):
                     TaskStatus.CANCELED
                 ],
                 callback=None)
+            assert t.get('status').lower() == TaskStatus.SUCCESS.value
             tags = {}
             tags['cse.cluster.id'] = self.cluster_id
             tags['cse.version'] = pkg_resources.require(
@@ -374,8 +394,73 @@ def create_cluster_thread(self):
                         fail_on_status=None,
                         expected_target_statuses=[TaskStatus.SUCCESS],
                         callback=None)
+            self.update_task(
+                TaskStatus.RUNNING,
+                self.op,
+                message='Creating master node for %s(%s)' % (self.cluster_name,
+                                                             self.cluster_id))
+            template = self.get_template()
+            vapp.reload()
+            add_nodes(
+                1,
+                template,
+                TYPE_MASTER,
+                self.config,
+                self.client_tenant,
+                org,
+                vdc,
+                vapp,
+                self.body,
+                wait=True)
+
+            self.update_task(
+                TaskStatus.RUNNING,
+                self.op,
+                message='Initializing cluster %s(%s)' % (self.cluster_name,
+                                                         self.cluster_id))
+
+            vapp.reload()
+            init_cluster(self.config, vapp, template)
+
+            master_ip = get_master_ip(self.config, vapp, template)
+            t = vapp.set_metadata('GENERAL', 'READWRITE', 'cse.master.ip',
+                                  master_ip)
+            self.client_tenant.get_task_monitor().\
+                wait_for_status(
+                    task=t,
+                    timeout=600,
+                    poll_frequency=5,
+                    fail_on_status=None,
+                    expected_target_statuses=[TaskStatus.SUCCESS],
+                    callback=None)
 
-            # self.customize_nodes()
+            if self.body['node_count'] > 0:
+
+                self.update_task(
+                    TaskStatus.RUNNING,
+                    self.op,
+                    message='Creating %s node(s) for %s(%s)' %
+                    (self.body['node_count'], self.cluster_name,
+                     self.cluster_id))
+                add_nodes(
+                    self.body['node_count'],
+                    template,
+                    TYPE_NODE,
+                    self.config,
+                    self.client_tenant,
+                    org,
+                    vdc,
+                    vapp,
+                    self.body,
+                    wait=True)
+                self.update_task(
+                    TaskStatus.RUNNING,
+                    self.op,
+                    message='Adding %s node(s) to %s(%s)' %
+                    (self.body['node_count'], self.cluster_name,
+                     self.cluster_id))
+                vapp.reload()
+                join_cluster(self.config, vapp, template)
 
             self.update_task(
                 TaskStatus.SUCCESS,
diff --git a/container_service_extension/client/__init__.py b/container_service_extension/client/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/container_service_extension/client/cluster.py b/container_service_extension/client/cluster.py
new file mode 100644
index 000000000..cd49071c6
--- /dev/null
+++ b/container_service_extension/client/cluster.py
@@ -0,0 +1,129 @@
+# container-service-extension
+# Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+# SPDX-License-Identifier: BSD-2-Clause
+
+
+import json
+import requests
+
+
+class Cluster(object):
+    def __init__(self, client):
+        self.client = client
+        self._uri = self.client.get_api_uri() + '/cse'
+
+    def get_templates(self):
+        method = 'GET'
+        uri = '%s/template' % (self._uri)
+        response = self.client._do_request_prim(
+            method,
+            uri,
+            self.client._session,
+            contents=None,
+            media_type=None,
+            accept_type='application/*+json',
+            auth=None)
+        if response.status_code == requests.codes.ok:
+            return json.loads(response.content.decode("utf-8"))
+        else:
+            raise Exception(json.loads(response.content))
+
+    def get_clusters(self):
+        method = 'GET'
+        uri = self._uri
+        response = self.client._do_request_prim(
+            method,
+            uri,
+            self.client._session,
+            contents=None,
+            media_type=None,
+            accept_type='application/*+json',
+            auth=None)
+        if response.status_code == requests.codes.ok:
+            return json.loads(response.content.decode("utf-8"))
+        else:
+            raise Exception(json.loads(response.content))
+
+    def create_cluster(self,
+                       vdc,
+                       network_name,
+                       name,
+                       node_count=2,
+                       cpu_count=None,
+                       memory=None,
+                       storage_profile=None,
+                       ssh_key=None,
+                       template=None):
+        """Create a new Kubernetes cluster
+
+        :param vdc: (str): The name of the vdc backing the org in which the
+            cluster would be created
+        :param network_name: (str): The name of the network to which the
+            cluster vApp will connect to
+        :param name: (str): The name of the cluster
+        :param node_count: (str): The number of slave nodes
+        :param cpu_count: (str): The number of virtual cpus on each of the
+            nodes in the cluster
+        :param memory: (str): The amount of memory (in MB) on each of the nodes
+            in the cluster
+        :param storage_profile: (str): The name of the storage profile which
+            will back the cluster
+        :param ssh_key: (str): The ssh key that clients can use to log into the
+            node vms without explicitly providing passwords
+        :param template: (str): The name of the catalog template to
+            instantiate the nodes from
+        :return: (json) A parsed json object describing the requested cluster.
+        """
+        method = 'POST'
+        uri = self._uri
+        data = {
+            'name': name,
+            'node_count': node_count,
+            'vdc': vdc,
+            'cpu_count': cpu_count,
+            'memory': memory,
+            'network': network_name,
+            'storage_profile': storage_profile,
+            'ssh_key': ssh_key,
+            'template': template
+        }
+        response = self.client._do_request_prim(
+            method,
+            uri,
+            self.client._session,
+            contents=data,
+            media_type=None,
+            accept_type='application/*+json')
+        if response.status_code == requests.codes.accepted:
+            return json.loads(response.content)
+        else:
+            raise Exception(json.loads(response.content).get('message'))
+
+    def delete_cluster(self, cluster_name):
+        method = 'DELETE'
+        uri = '%s/%s' % (self._uri, cluster_name)
+        response = self.client._do_request_prim(
+            method,
+            uri,
+            self.client._session,
+            accept_type='application/*+json')
+        if response.status_code == requests.codes.accepted:
+            return json.loads(response.content)
+        else:
+            raise Exception(json.loads(response.content).get('message'))
+
+    def get_config(self, cluster_name):
+        method = 'GET'
+        uri = '%s/%s/config' % (self._uri, cluster_name)
+        response = self.client._do_request_prim(
+            method,
+            uri,
+            self.client._session,
+            contents=None,
+            media_type=None,
+            accept_type='text/x-yaml',
+            auth=None)
+        if response.status_code == requests.codes.ok:
+            return response.content.decode('utf-8').replace('\\n', '\n')[1:-1]
+        else:
+            raise Exception(json.loads(response.content))
diff --git a/container_service_extension/client/cse.py b/container_service_extension/client/cse.py
new file mode 100644
index 000000000..fd6bb0ce9
--- /dev/null
+++ b/container_service_extension/client/cse.py
@@ -0,0 +1,331 @@
+# container-service-extension
+# Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+# SPDX-License-Identifier: BSD-2-Clause
+
+from os.path import expanduser
+from os.path import join
+
+import click
+
+from container_service_extension.client.cluster import Cluster
+
+from vcd_cli.utils import restore_session
+from vcd_cli.utils import stderr
+from vcd_cli.utils import stdout
+from vcd_cli.vcd import abort_if_false
+from vcd_cli.vcd import vcd
+
+import yaml
+
+@vcd.group(short_help='manage clusters')
+@click.pass_context
+def cse(ctx):
+    """Work with kubernetes clusters in vCloud Director.
+
+\b
+    Examples
+        vcd cse cluster list
+            Get list of kubernetes clusters in current virtual datacenter.
+\b
+        vcd cse cluster create dev-cluster --network net1
+            Create a kubernetes cluster in current virtual datacenter.
+\b
+        vcd cse cluster create prod-cluster --nodes 4 \\
+                    --network net1 --storage-profile '*'
+            Create a kubernetes cluster with 4 worker nodes.
+\b
+        vcd cse cluster delete dev-cluster
+            Delete a kubernetes cluster by name.
+\b
+        vcd cse cluster create c1 --nodes 0 --network net1
+            Create a single node kubernetes cluster for dev/test.
+\b
+        vcd cse template list
+            Get list of CSE templates available.
+    """
+
+    if ctx.invoked_subcommand is not None:
+        try:
+            restore_session(ctx)
+            if not ctx.obj['profiles'].get('vdc_in_use') or \
+               not ctx.obj['profiles'].get('vdc_href'):
+                raise Exception('select a virtual datacenter')
+        except Exception as e:
+            stderr(e, ctx)
+
+
+@cse.group(short_help='work with clusters')
+@click.pass_context
+def cluster(ctx):
+    """Work with kubernetes clusters."""
+
+    if ctx.invoked_subcommand is not None:
+        try:
+            restore_session(ctx)
+            if not ctx.obj['profiles'].get('vdc_in_use') or \
+               not ctx.obj['profiles'].get('vdc_href'):
+                raise Exception('select a virtual datacenter')
+        except Exception as e:
+            stderr(e, ctx)
+
+
+@cse.group(short_help='manage CSE templates')
+@click.pass_context
+def template(ctx):
+    """Work with CSE templates."""
+
+    if ctx.invoked_subcommand is not None:
+        try:
+            restore_session(ctx)
+            if not ctx.obj['profiles'].get('vdc_in_use') or \
+               not ctx.obj['profiles'].get('vdc_href'):
+                raise Exception('select a virtual datacenter')
+        except Exception as e:
+            stderr(e, ctx)
+
+
+@template.command('list', short_help='list templates')
+@click.pass_context
+def list_templates(ctx):
+    try:
+        client = ctx.obj['client']
+        cluster = Cluster(client)
+        result = []
+        templates = cluster.get_templates()
+        for t in templates:
+            result.append({'name': t['name'],
+                           'description': t['description'],
+                           'catalog': t['catalog'],
+                           'catalog_item': t['catalog_item'],
+                           'is_default': t['is_default'],
+                           })
+        stdout(result, ctx, show_id=True)
+    except Exception as e:
+        stderr(e, ctx)
+
+
+@cluster.command('list', short_help='list clusters')
+@click.pass_context
+def list_clusters(ctx):
+    try:
+        client = ctx.obj['client']
+        cluster = Cluster(client)
+        result = []
+        clusters = cluster.get_clusters()
+        for c in clusters:
+            result.append({'name': c['name'],
+                           'IP master': c['leader_endpoint'],
+                           'VMs': c['number_of_vms'],
+                           'vdc': c['vdc_name']
+                           })
+        stdout(result, ctx, show_id=True)
+    except Exception as e:
+        stderr(e, ctx)
+
+
+@cluster.command(short_help='delete cluster')
+@click.pass_context
+@click.argument('name',
+                metavar='<name>',
+                required=True)
+@click.option('-y',
+              '--yes',
+              is_flag=True,
+              callback=abort_if_false,
+              expose_value=False,
+              prompt='Are you sure you want to delete the cluster?')
+def delete(ctx, name):
+    try:
+        client = ctx.obj['client']
+        cluster = Cluster(client)
+        result = cluster.delete_cluster(name)
+        stdout(result, ctx)
+    except Exception as e:
+        stderr(e, ctx)
+
+
+@cluster.command(short_help='create cluster')
+@click.pass_context
+@click.argument('name',
+                metavar='<name>',
+                required=True)
+@click.option('-N',
+              '--nodes',
+              'node_count',
+              required=False,
+              default=2,
+              metavar='<nodes>',
+              help='Number of nodes to create')
+@click.option('-c',
+              '--cpu',
+              'cpu_count',
+              required=False,
+              default=None,
+              metavar='<cpu-count>',
+              help='Number of virtual cpus on each node')
+@click.option('-m',
+              '--memory',
+              'memory',
+              required=False,
+              default=None,
+              metavar='<memory>',
+              help='Amount of memory (in MB) on each node')
+@click.option('-n',
+              '--network',
+              'network_name',
+              default=None,
+              required=False,
+              metavar='<network>',
+              help='Network name')
+@click.option('-s',
+              '--storage-profile',
+              'storage_profile',
+              required=False,
+              default=None,
+              metavar='<storage-profile>',
+              help='Name of the storage profile for the nodes')
+@click.option('-k',
+              '--ssh-key',
+              'ssh_key_file',
+              required=False,
+              default=None,
+              type=click.File('r'),
+              metavar='<ssh-key>',
+              help='SSH public key to connect to the guest OS on the VM')
+@click.option('-t',
+              '--template',
+              'template',
+              required=False,
+              default=None,
+              metavar='<template>',
+              help='Name of the template to instantiate nodes from')
+def create(ctx, name, node_count, cpu_count, memory, network_name,
+           storage_profile, ssh_key_file, template):
+    try:
+        client = ctx.obj['client']
+        cluster = Cluster(client)
+        ssh_key = None
+        if ssh_key_file is not None:
+            ssh_key = ssh_key_file.read()
+        result = cluster.create_cluster(
+                    ctx.obj['profiles'].get('vdc_in_use'),
+                    network_name,
+                    name,
+                    node_count=node_count,
+                    cpu_count=cpu_count,
+                    memory=memory,
+                    storage_profile=storage_profile,
+                    ssh_key=ssh_key,
+                    template=template)
+        stdout(result, ctx)
+    except Exception as e:
+        stderr(e, ctx)
+
+
+@cluster.command(short_help='get cluster config')
+@click.pass_context
+@click.argument('name',
+                metavar='<name>',
+                required=True)
+def config(ctx, name):
+    try:
+        client = ctx.obj['client']
+        cluster = Cluster(client)
+        click.secho(cluster.get_config(name))
+    except Exception as e:
+        stderr(e, ctx)
+
+
+@cluster.command('add-node', short_help='add node')
+@click.pass_context
+@click.argument('name',
+                metavar='<name>',
+                required=True)
+@click.option('-N',
+              '--nodes',
+              'node_count',
+              required=False,
+              default=1,
+              metavar='<nodes>',
+              help='Number of nodes to add')
+@click.option('-c',
+              '--cpu',
+              'cpu_count',
+              required=False,
+              default=None,
+              metavar='<cpu-count>',
+              help='Number of virtual cpus on each node')
+@click.option('-m',
+              '--memory',
+              'memory',
+              required=False,
+              default=None,
+              metavar='<memory>',
+              help='Amount of memory (in MB) on each node')
+@click.option('-n',
+              '--network',
+              'network_name',
+              default=None,
+              required=False,
+              metavar='<network>',
+              help='Network name')
+@click.option('-s',
+              '--storage-profile',
+              'storage_profile',
+              required=False,
+              default=None,
+              metavar='<storage-profile>',
+              help='Name of the storage profile for the nodes')
+@click.option('-k',
+              '--ssh-key',
+              'ssh_key_file',
+              required=False,
+              default=None,
+              type=click.File('r'),
+              metavar='<ssh-key>',
+              help='SSH public key to connect to the guest OS on the VM')
+@click.option('-t',
+              '--template',
+              'template',
+              required=False,
+              default=None,
+              metavar='<template>',
+              help='Name of the template to instantiate nodes from')
+@click.option('--type',
+              'node_type',
+              required=False,
+              default='node',
+              type=click.Choice(['node']),
+              help='type of node to add')
+def add_node(ctx, name, node_count, cpu_count, memory, network_name,
+           storage_profile, ssh_key_file, template, node_type):
+    try:
+        client = ctx.obj['client']
+        cluster = Cluster(client)
+    except Exception as e:
+        stderr(e, ctx)
+
+
+@cluster.command('save-config')
+@click.pass_context
+def save_config(ctx):
+    try:
+        f = join(expanduser('~'), '.kube/config')
+        stream = open(f, 'r')
+        docs = yaml.load_all(stream)
+        for doc in docs:
+            for k, v in doc.items():
+                if k == 'contexts':
+                    for c in v:
+                        print(c['name'])
+                        print('  cluster: %s' % c['context']['cluster'])
+                        print('  user:    %s' % c['context']['user'])
+                # elif k == 'clusters':
+                #     for cluster in v:
+                #         print(cluster['name'], cluster['cluster']['server'])
+                # elif k == 'users':
+                #     for user in v:
+                #         print(user['name'], user['user'])
+
+    except Exception as e:
+        stderr(e, ctx)
diff --git a/container_service_extension/cluster.py b/container_service_extension/cluster.py
index 65ea35100..121c8f0a2 100644
--- a/container_service_extension/cluster.py
+++ b/container_service_extension/cluster.py
@@ -3,11 +3,37 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 import logging
+
 from pyvcloud.vcd.client import QueryResultFormat
+from pyvcloud.vcd.client import TaskStatus
+from pyvcloud.vcd.vapp import VApp
+from pyvcloud.vcd.vm import VM
+
+import random
+import string
+import time
+from vsphere_guest_run.vsphere import VSphere
 
-TYPE_MASTER = 'master'
+TYPE_MASTER = 'mstr'
 TYPE_NODE = 'node'
 LOGGER = logging.getLogger(__name__)
+logging.basicConfig(filename='cse.log')
+
+
+def wait_until_tools_ready(vm):
+    while True:
+        try:
+            status = vm.guest.toolsRunningStatus
+            if 'guestToolsRunning' == status:
+                LOGGER.debug('vm tools %s are ready' % vm)
+                return
+            LOGGER.debug('waiting for vm tools %s to be ready (%s)' % (vm,
+                                                                       status))
+            time.sleep(1)
+        except Exception:
+            LOGGER.debug('waiting for vm tools %s to be ready (%s)* ' %
+                         (vm, status))
+            time.sleep(1)
 
 
 def load_from_metadata(client, name=None, cluster_id=None,
@@ -26,7 +52,7 @@ def load_from_metadata(client, name=None, cluster_id=None,
         resource_type,
         query_result_format=QueryResultFormat.ID_RECORDS,
         qfilter=query_filter,
-        fields='metadata:cse.cluster.id')
+        fields='metadata:cse.cluster.id,metadata:cse.master.ip')
     records = list(q.execute())
     nodes = []
     for record in records:
@@ -37,7 +63,9 @@ def load_from_metadata(client, name=None, cluster_id=None,
             'vdc_name': record.get('vdcName'),
             'vapp_id': vapp_id,
             'vapp_href': '%s/vApp/vapp-%s' % (client._uri, vapp_id),
-            'vdc_href': '%s/vdc/%s' % (client._uri, vdc_id)
+            'vdc_href': '%s/vdc/%s' % (client._uri, vdc_id),
+            'record': record,
+            'master_ip': ''
         }
         if hasattr(record, 'Metadata'):
             for me in record.Metadata.MetadataEntry:
@@ -45,18 +73,319 @@ def load_from_metadata(client, name=None, cluster_id=None,
                     node['cluster_id'] = str(me.TypedValue.Value)
                 elif me.Key == 'cse.version':
                     node['cse_version'] = str(me.TypedValue.Value)
+                elif me.Key == 'cse.master.ip':
+                    node['master_ip'] = str(me.TypedValue.Value)
         nodes.append(node)
     for node in nodes:
         cluster = {}
         cluster['name'] = node['vapp_name']
         cluster['cluster_id'] = node['cluster_id']
         cluster['status'] = ''
-        cluster['leader_endpoint'] = None
+        cluster['leader_endpoint'] = node['master_ip']
         cluster['vapp_id'] = node['vapp_id']
         cluster['vapp_href'] = node['vapp_href']
         cluster['vdc_name'] = node['vdc_name']
         cluster['vdc_href'] = node['vdc_href']
         cluster['master_nodes'] = []
         cluster['nodes'] = []
+        cluster['number_of_vms'] = node['record'].get('numberOfVMs')
         clusters_dict[cluster['name']] = cluster
     return list(clusters_dict.values())
+
+
+def add_nodes(qty,
+              template,
+              node_type,
+              config,
+              client,
+              org,
+              vdc,
+              vapp,
+              body,
+              wait=True):
+    if qty < 1:
+        return None
+    specs = []
+    catalog_item = org.get_catalog_item(config['broker']['catalog'],
+                                        template['catalog_item'])
+    source_vapp = VApp(client, href=catalog_item.Entity.get('href'))
+    source_vm = source_vapp.get_all_vms()[0].get('name')
+    storage_profile = None
+    if 'storage_profile' in body and body['storage_profile'] is not None:
+        storage_profile = vdc.get_storage_profile(body['storage_profile'])
+    cust_script_init = \
+"""#!/usr/bin/env bash
+if [ x$1=x"postcustomization" ];
+then
+""" # NOQA
+    cust_script_common = \
+"""
+echo "root:{password}" | chpasswd
+""".format(password=template['admin_password']) # NOQA
+    if 'ssh_key' in body:
+        cust_script_common += \
+"""
+mkdir -p /root/.ssh
+echo '{ssh_key}' >> /root/.ssh/authorized_keys
+chmod -R go-rwx /root/.ssh
+""".format(ssh_key=body['ssh_key'])  # NOQA
+    cust_script_end = \
+"""
+fi
+"""  # NOQA
+    cust_script = cust_script_init
+    cust_script += cust_script_common
+    cust_script += cust_script_end
+    for n in range(qty):
+        name = None
+        while True:
+            name = '%s-%s' % (node_type, ''.join(
+                random.choices(string.ascii_lowercase + string.digits, k=4)))
+            try:
+                vapp.get_vm(name)
+            except Exception:
+                break
+        spec = {
+            'source_vm_name': source_vm,
+            'vapp': source_vapp.resource,
+            'target_vm_name': name,
+            'hostname': name,
+            'network': body['network'],
+            'ip_allocation_mode': 'pool',
+            'cust_script': cust_script
+        }
+        if storage_profile is not None:
+            spec['storage_profile'] = storage_profile
+        specs.append(spec)
+    if ('cpu_count' in body and body['cpu_count'] is not None) or (
+            'memory' in body and body['memory'] is not None):
+        reconfigure_hw = True
+    else:
+        reconfigure_hw = False
+
+    task = vapp.add_vms(specs, power_on=not reconfigure_hw)
+    if wait:
+        task = client.get_task_monitor().wait_for_status(
+            task=task,
+            timeout=600,
+            poll_frequency=5,
+            fail_on_status=None,
+            expected_target_statuses=[
+                TaskStatus.SUCCESS, TaskStatus.ABORTED, TaskStatus.ERROR,
+                TaskStatus.CANCELED
+            ],
+            callback=None)
+        if task.get('status').lower() != TaskStatus.SUCCESS.value:
+            task_resource = client.get_resource(task.get('href'))
+            if hasattr(task_resource, 'taskDetails'):
+                raise Exception(task_resource.get('taskDetails'))
+            elif hasattr(task_resource, 'Details'):
+                raise Exception(task_resource.Details.text)
+            else:
+                raise Exception('Couldn\'t add node(s).')
+    if wait and reconfigure_hw:
+        vapp.reload()
+        for spec in specs:
+            vm_resource = vapp.get_vm(spec['target_vm_name'])
+            if 'cpu_count' in body and body['cpu_count'] is not None:
+                vm = VM(client, resource=vm_resource)
+                task = vm.modify_cpu(body['cpu_count'])
+                task = client.get_task_monitor().wait_for_status(
+                    task=task,
+                    timeout=600,
+                    poll_frequency=5,
+                    fail_on_status=None,
+                    expected_target_statuses=[
+                        TaskStatus.SUCCESS, TaskStatus.ABORTED,
+                        TaskStatus.ERROR, TaskStatus.CANCELED
+                    ],
+                    callback=None)
+            if 'memory' in body and body['memory'] is not None:
+                vm = VM(client, resource=vm_resource)
+                task = vm.modify_memory(body['memory'])
+                task = client.get_task_monitor().wait_for_status(
+                    task=task,
+                    timeout=600,
+                    poll_frequency=5,
+                    fail_on_status=None,
+                    expected_target_statuses=[
+                        TaskStatus.SUCCESS, TaskStatus.ABORTED,
+                        TaskStatus.ERROR, TaskStatus.CANCELED
+                    ],
+                    callback=None)
+            vm = VM(client, resource=vm_resource)
+            task = vm.power_on()
+            if wait:
+                task = client.get_task_monitor().wait_for_status(
+                    task=task,
+                    timeout=600,
+                    poll_frequency=5,
+                    fail_on_status=None,
+                    expected_target_statuses=[
+                        TaskStatus.SUCCESS, TaskStatus.ABORTED,
+                        TaskStatus.ERROR, TaskStatus.CANCELED
+                    ],
+                    callback=None)
+                if task.get('status').lower() != TaskStatus.SUCCESS.value:
+                    task_resource = client.get_resource(task.get('href'))
+                    if hasattr(task_resource, 'taskDetails'):
+                        raise Exception(task_resource.get('taskDetails'))
+                    elif hasattr(task_resource, 'Details'):
+                        raise Exception(task_resource.Details.text)
+                    else:
+                        raise Exception('Couldn\'t add node(s).')
+    return {'task': task, 'specs': specs}
+
+
+def get_nodes(vapp, node_type):
+    nodes = []
+    for node in vapp.get_all_vms():
+        if node.get('name').startswith(node_type):
+            nodes.append(node)
+    return nodes
+
+
+def delete_nodes(node_names, client, vapp):
+    pass
+
+
+def wait_for_tools_ready_callback(message, exception=None):
+    print('waiting for guest tools, status: %s' % message)
+    LOGGER.debug('waiting for guest tools, status: %s' % message)
+    if exception is not None:
+        LOGGER.error('exception: %s' % str(exception))
+
+
+def wait_for_guest_execution_callback(message, exception=None):
+    LOGGER.debug(message)
+    print(message)
+    if exception is not None:
+        LOGGER.error('exception: %s' % str(exception))
+
+
+def get_init_info(config, vapp, password):
+    script = \
+"""#!/usr/bin/env bash
+kubeadm token create
+ip route get 1 | awk '{print $NF;exit}'
+""" # NOQA
+    nodes = get_nodes(vapp, TYPE_MASTER)
+    result = execute_script_in_nodes(
+        config, vapp, password, script, nodes, check_tools=False)
+    return result[0][1].content.decode().split()
+
+
+def get_master_ip(config, vapp, template):
+    script = \
+"""#!/usr/bin/env bash
+ip route get 1 | awk '{print $NF;exit}'
+""" # NOQA
+    nodes = get_nodes(vapp, TYPE_MASTER)
+    result = execute_script_in_nodes(
+        config,
+        vapp,
+        template['admin_password'],
+        script,
+        nodes,
+        check_tools=False)
+    return result[0][1].content.decode().split()[0]
+
+
+def init_cluster(config, vapp, template):
+    from container_service_extension.config import get_data_file
+    script = get_data_file('master-%s.sh' % template['name'])
+    nodes = get_nodes(vapp, TYPE_MASTER)
+    result = execute_script_in_nodes(config, vapp, template['admin_password'],
+                                     script, nodes)
+    if result[0][0] != 0:
+        raise Exception('Couldn\'t initialize cluster:\n%s' %
+                        result[0][2].content.decode())
+
+
+def join_cluster(config, vapp, template):
+    from container_service_extension.config import get_data_file
+    init_info = get_init_info(config, vapp, template['admin_password'])
+    tmp_script = get_data_file('node-%s.sh' % template['name'])
+    script = tmp_script.format(token=init_info[0], ip=init_info[1])
+    nodes = get_nodes(vapp, TYPE_NODE)
+    results = execute_script_in_nodes(config, vapp, template['admin_password'],
+                                      script, nodes)
+    for result in results:
+        if result[0] != 0:
+            raise Exception(
+                'Couldn\'t join cluster:\n%s' % result[2].content.decode())
+
+
+def wait_until_ready_to_exec(vs, vm, password, tries=30):
+    ready = False
+    script = \
+"""#!/usr/bin/env bash
+uname -a
+""" # NOQA
+    for n in range(tries):
+        try:
+            result = vs.execute_script_in_guest(
+                vm,
+                'root',
+                password,
+                script,
+                target_file=None,
+                wait_for_completion=True,
+                wait_time=5,
+                get_output=True,
+                delete_script=True,
+                callback=wait_for_guest_execution_callback)
+            if result[0] == 0:
+                ready = True
+                break
+            raise Exception('script returned %s' % result[0])
+        except Exception:
+            print('VM is not ready to execute scripts, yet')
+            time.sleep(2)
+    if not ready:
+        raise Exception('VM is not ready to execute scripts')
+
+
+def execute_script_in_nodes(config,
+                            vapp,
+                            password,
+                            script,
+                            nodes,
+                            check_tools=True):
+    vs = VSphere(
+        config['vcs']['host'],
+        config['vcs']['username'],
+        config['vcs']['password'],
+        port=int(config['vcs']['port']))
+    vs.connect()
+    all_results = []
+    for node in nodes:
+        LOGGER.debug('running script on %s' % node.get('name'))
+        print('running script on %s' % node.get('name'))
+        moid = vapp.get_vm_moid(node.get('name'))
+        vm = vs.get_vm_by_moid(moid)
+        if check_tools:
+            vs.wait_until_tools_ready(
+                vm, sleep=5, callback=wait_for_tools_ready_callback)
+            wait_until_ready_to_exec(vs, vm, password)
+        result = vs.execute_script_in_guest(
+            vm,
+            'root',
+            password,
+            script,
+            target_file=None,
+            wait_for_completion=True,
+            wait_time=10,
+            get_output=True,
+            delete_script=True,
+            callback=wait_for_guest_execution_callback)
+        result_stdout = result[1].content.decode()
+        result_stderr = result[2].content.decode()
+        LOGGER.debug(result[0])
+        LOGGER.debug(result_stderr)
+        LOGGER.debug(result_stdout)
+        print(result[0])
+        print(result_stderr)
+        print(result_stdout)
+        all_results.append(result)
+    return all_results
diff --git a/container_service_extension/config.py b/container_service_extension/config.py
index 124000055..dcffa837f 100644
--- a/container_service_extension/config.py
+++ b/container_service_extension/config.py
@@ -3,21 +3,26 @@
 # SPDX-License-Identifier: BSD-2-Clause
 
 from __future__ import print_function
+
+import hashlib
+import logging
+import os
+
 import click
 from container_service_extension.broker import get_sample_broker_config
 from container_service_extension.broker import validate_broker_config_content
 from container_service_extension.broker import validate_broker_config_elements
-import hashlib
-import logging
-import os
-import pika
+from pyvcloud.vcd.amqp import AmqpService
 from pyvcloud.vcd.client import BasicLoginCredentials
 from pyvcloud.vcd.client import Client
 from pyvcloud.vcd.client import QueryResultFormat
 from pyvcloud.vcd.client import SIZE_1MB
+from pyvcloud.vcd.extension import Extension
 from pyvcloud.vcd.org import Org
 from pyvcloud.vcd.vapp import VApp
 from pyvcloud.vcd.vdc import VDC
+
+import pika
 import requests
 import site
 import time
@@ -32,11 +37,14 @@
     'amqp': {
         'host': 'amqp.vmware.com',
         'port': 5672,
+        'prefix': 'vcd',
         'username': 'guest',
         'password': 'guest',
         'exchange': 'vcdext',
         'routing_key': 'cse',
-        'ssl': False
+        'ssl': False,
+        'ssl_accept_all': False,
+        'vhost': '/'
     }
 }
 
@@ -111,7 +119,7 @@ def get_config(config_file_name):
     return config
 
 
-def check_config(config_file_name):
+def check_config(config_file_name, template):
     click.secho('Validating CSE on vCD from file: %s' % config_file_name)
     config = get_config(config_file_name)
     validate_broker_config_elements(config['broker'])
@@ -148,7 +156,7 @@ def check_config(config_file_name):
                                               bool_to_msg(True)))
     click.secho('Validating \'%s\' service broker' % config['broker']['type'])
     if config['broker']['type'] == 'default':
-        validate_broker_config_content(config, client)
+        validate_broker_config_content(config, client, template)
 
     v = VSphere(
         config['vcs']['host'],
@@ -199,9 +207,11 @@ def uninstall_cse(ctx, config_file_name, template_name):
         assert vdc
         for template in config['broker']['templates']:
             if template_name == '*' or template['name'] == template_name:
-                click.secho('Deleting template: %s' % template['name'])
+                click.secho('Deleting template: %s (%s:%s)' %
+                            (template['name'], config['broker']['catalog'],
+                             template['catalog_item']))
                 org.delete_catalog_item(config['broker']['catalog'],
-                                        template['name'])
+                                        template['catalog_item'])
 
 
 def install_cse(ctx, config_file_name, template_name, no_capture):
@@ -254,18 +264,19 @@ def install_cse(ctx, config_file_name, template_name, no_capture):
                 click.secho('Processing template: %s' % template['name'])
                 try:
                     org.get_catalog_item(config['broker']['catalog'],
-                                         template['name'])
+                                         template['catalog_item'])
                 except Exception:
                     create_template(ctx, config, client, org, vdc_resource,
                                     catalog, no_capture, template)
                 k8s_template = None
                 try:
                     k8s_template = org.get_catalog_item(
-                        config['broker']['catalog'], template['name'])
+                        config['broker']['catalog'], template['catalog_item'])
                 except Exception:
                     pass
                 click.echo('Find template \'%s\', \'%s\': %s' %
-                           (config['broker']['catalog'], template['name'],
+                           (config['broker']['catalog'],
+                            template['catalog_item'],
                             bool_to_msg(k8s_template is not None)))
         configure_amqp_settings(client, config)
         register_extension(client, config)
@@ -398,7 +409,7 @@ def create_template(ctx, config, client, org, vdc_resource, catalog,
             'Creating vApp template \'%s\'' % template['temp_vapp'],
             fg='green')
 
-        init_script = get_data_file('init-%s.txt' % template['name'])
+        init_script = get_data_file('init-%s.sh' % template['name'])
         vapp_resource = vdc.instantiate_vapp(
             template['temp_vapp'],
             catalog.get('name'),
@@ -436,7 +447,7 @@ def create_template(ctx, config, client, org, vdc_resource, catalog,
             fg='green')
         vapp.reload()
         password_auto = vapp.get_admin_password(template['temp_vapp'])
-        cust_script = get_data_file('cust-%s.txt' % template['name'])
+        cust_script = get_data_file('cust-%s.sh' % template['name'])
 
         result = vs.execute_script_in_guest(
             vm,
@@ -486,7 +497,7 @@ def capture_as_template(ctx, config, vapp_resource, org, catalog, template):
     task = org.capture_vapp(
         catalog,
         vapp_resource.get('href'),
-        template['name'],
+        template['catalog_item'],
         'CSE Kubernetes template',
         customize_on_instantiate=True)
     stdout(task, ctx)
@@ -494,10 +505,38 @@ def capture_as_template(ctx, config, vapp_resource, org, catalog, template):
 
 
 def configure_amqp_settings(client, config):
-    click.secho('See https://vmware.github.io/container-service-extension '
-                'to configure AMQP settings.')
+    amqp_service = AmqpService(client)
+    amqp = config['amqp']
+    amqp_config = {
+        'AmqpExchange': amqp['exchange'],
+        'AmqpHost': amqp['host'],
+        'AmqpPort': amqp['port'],
+        'AmqpPrefix': amqp['prefix'],
+        'AmqpSslAcceptAll': amqp['ssl_accept_all'],
+        'AmqpUseSSL': amqp['ssl'],
+        'AmqpUsername': amqp['username'],
+        'AmqpVHost': amqp['vhost']
+    }
+    result = amqp_service.test_config(amqp_config, amqp['password'])
+    click.secho('AMQP test settings, result: %s' % result['Valid'].text)
+
+    if result['Valid'].text == 'true':
+        amqp_service.set_config(amqp_config, amqp['password'])
+        click.secho('Updated vCD AMQP configuration.')
+    else:
+        click.secho('Couldn\'t set vCD AMQP configuration.')
 
 
 def register_extension(client, config):
-    click.secho('See https://vmware.github.io/container-service-extension '
-                'to register API extension.')
+    ext = Extension(client)
+    try:
+        name = 'cse'
+        cse_ext = ext.get_extension(name)
+        click.secho('Find extension \'%s\', enabled: %s: %s' %
+                    (name, cse_ext['enabled'], bool_to_msg(True)))
+    except Exception:
+        exchange = 'vcdext'
+        patterns = '/api/cse,/api/cse/.*,/api/cse/.*/.*'
+        ext.add_extension(name, name, name, exchange, patterns.split(','))
+        click.secho('Registered extension \'%s\': %s' % (name,
+                                                         bool_to_msg(True)))
diff --git a/container_service_extension/cse.py b/container_service_extension/cse.py
index 6777305be..8dfd5117c 100755
--- a/container_service_extension/cse.py
+++ b/container_service_extension/cse.py
@@ -43,10 +43,10 @@ def cli(ctx):
         cse install
             Install CSE.
 \b
-        cse install --template photon-custom-hw11-1.0-62c543d-k8s
+        cse install --template photon-v1
             Install CSE. It only creates the template specified.
 \b
-        cse install --template photon-custom-hw11-1.0-62c543d-k8s --no-capture
+        cse install --template photon-v1 --no-capture
             Install CSE. It only creates the temporary vApp specified in the
             config file. It will not capture the vApp in the catalog.
 \b
@@ -106,11 +106,19 @@ def sample(ctx):
     envvar='CSE_CONFIG',
     default='config.yaml',
     help='Config file to use.')
-def check(ctx, config):
+@click.option(
+    '-t',
+    '--template',
+    'template',
+    required=False,
+    default='*',
+    metavar='<template>',
+    help='template')
+def check(ctx, config, template):
     """Validate CSE configuration"""
 
     try:
-        check_config(config)
+        check_config(config, template)
         click.secho('The configuration is valid.')
     except Exception as e:
         LOGGER.error(traceback.format_exc())
diff --git a/container_service_extension/node.py b/container_service_extension/node.py
deleted file mode 100644
index e36edad84..000000000
--- a/container_service_extension/node.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# container-service-extension
-# Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-# SPDX-License-Identifier: BSD-2-Clause
-
-import logging
-
-LOGGER = logging.getLogger(__name__)
diff --git a/container_service_extension/processor.py b/container_service_extension/processor.py
index 958fe7e69..bff756e50 100644
--- a/container_service_extension/processor.py
+++ b/container_service_extension/processor.py
@@ -34,9 +34,12 @@ def process_request(self, body):
         cluster_name = None
         spec_request = False
         config_request = False
+        template_request = False
         if len(tokens) > 3:
             if tokens[3] in ['swagger', 'swagger.json', 'swagger.yaml']:
                 spec_request = True
+            elif tokens[3] == 'template':
+                template_request = True
             elif tokens[3] != '':
                 cluster_name = tokens[3]
         if len(tokens) > 4:
@@ -59,6 +62,27 @@ def process_request(self, body):
             elif config_request:
                 broker = get_new_broker(self.config)
                 reply = broker.get_cluster_config(body['headers'])
+            elif template_request:
+                result = {}
+                templates = []
+                for t in self.config['broker']['templates']:
+                    is_default = \
+                        t['name'] == self.config['broker']['default_template']
+                    templates.append({
+                        'name':
+                        t['name'],
+                        'is_default':
+                        is_default,
+                        'catalog':
+                        self.config['broker']['catalog'],
+                        'catalog_item':
+                        t['catalog_item'],
+                        'description':
+                        t['description']
+                    })
+                result['body'] = templates
+                result['status_code'] = 200
+                reply = result
             elif cluster_name is None:
                 broker = get_new_broker(self.config)
                 reply = broker.list_clusters(body['headers'], request_body)
diff --git a/container_service_extension/service.py b/container_service_extension/service.py
index 8bfe27a91..8e36778e8 100644
--- a/container_service_extension/service.py
+++ b/container_service_extension/service.py
@@ -48,6 +48,7 @@ def run(self):
             format=self.config['service']['logging_format'])
 
         click.echo('Container Service Extension for vCloud Director running')
+        click.echo('config file: %s' % self.config_file)
         click.echo('see file ' 'cse.log' ' for details')
         click.echo('press Ctrl+C to finish')
 
diff --git a/requirements.txt b/requirements.txt
index cfd786a09..c46e0a910 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 pika >= 0.10.0
-vsphere-guest-run
-pyvcloud >= 18.2.1
-vcd-cli >= 19.2.2
+vsphere-guest-run >= 0.0.2
+pyvcloud >= 18.2.2
+vcd-cli >= 19.2.3
 humanfriendly
diff --git a/scripts/cust-photon-custom-hw11-1.0-62c543d-k8s.txt b/scripts/cust-photon-v1.sh
similarity index 79%
rename from scripts/cust-photon-custom-hw11-1.0-62c543d-k8s.txt
rename to scripts/cust-photon-v1.sh
index 8703b6245..341035e82 100644
--- a/scripts/cust-photon-custom-hw11-1.0-62c543d-k8s.txt
+++ b/scripts/cust-photon-v1.sh
@@ -23,7 +23,7 @@ tdnf install -y docker-17.06.0-1.ph1
 systemctl enable docker.service
 systemctl start docker.service
 
-tdnf install -y wget kubernetes-1.8.1-3.ph1 kubernetes-kubeadm-1.8.1-3.ph1
+tdnf install -y wget gawk kubernetes-1.8.1-3.ph1 kubernetes-kubeadm-1.8.1-3.ph1
 
 docker pull gcr.io/google_containers/kube-controller-manager-amd64:v1.8.1
 docker pull gcr.io/google_containers/kube-scheduler-amd64:v1.8.1
@@ -41,8 +41,13 @@ docker pull weaveworks/weave-kube:2.0.5
 export kubever=$(kubectl version --client | base64 | tr -d '\n')
 wget -O weave.yml "https://cloud.weave.works/k8s/net?k8s-version=$kubever&version=2.0.5"
 
-echo -n > /etc/machine-id
+### harbor
+curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+wget --no-verbose https://github.com/vmware/harbor/releases/download/v1.2.2/harbor-offline-installer-v1.2.2.tgz
 
+### common
+echo -n > /etc/machine-id
 echo 'customization completed'
 sync
 sync
diff --git a/scripts/cust-ubuntu-16.04-server-cloudimg-amd64-k8s.txt b/scripts/cust-ubuntu-16.04.sh
similarity index 88%
rename from scripts/cust-ubuntu-16.04-server-cloudimg-amd64-k8s.txt
rename to scripts/cust-ubuntu-16.04.sh
index 4bcd6509a..9bd143b4c 100644
--- a/scripts/cust-ubuntu-16.04-server-cloudimg-amd64-k8s.txt
+++ b/scripts/cust-ubuntu-16.04.sh
@@ -53,8 +53,13 @@ echo 'PATH=$GOPATH/bin:$PATH' >> /root/.bashrc
 go version
 curl https://glide.sh/get | sh
 
-echo -n > /etc/machine-id
+### harbor
+curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+wget --no-verbose https://github.com/vmware/harbor/releases/download/v1.2.2/harbor-offline-installer-v1.2.2.tgz
 
+### common
+echo -n > /etc/machine-id
 echo 'customization completed'
 sync
 sync
diff --git a/scripts/init-photon-custom-hw11-1.0-62c543d-k8s.txt b/scripts/init-photon-v1.sh
similarity index 100%
rename from scripts/init-photon-custom-hw11-1.0-62c543d-k8s.txt
rename to scripts/init-photon-v1.sh
diff --git a/scripts/init-ubuntu-16.04-server-cloudimg-amd64-k8s.txt b/scripts/init-ubuntu-16.04.sh
similarity index 100%
rename from scripts/init-ubuntu-16.04-server-cloudimg-amd64-k8s.txt
rename to scripts/init-ubuntu-16.04.sh
diff --git a/scripts/master-photon-v1.sh b/scripts/master-photon-v1.sh
new file mode 100644
index 000000000..be5b47da3
--- /dev/null
+++ b/scripts/master-photon-v1.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+while [ `systemctl is-active docker` != 'active' ]; do systemctl is-active docker; sleep 5; done
+kubeadm init --kubernetes-version=v1.8.1 > /root/kubeadm-init.out
+mkdir -p /root/.kube
+cp -f /etc/kubernetes/admin.conf /root/.kube/config
+chown $(id -u):$(id -g) /root/.kube/config
+kubectl apply -f /root/weave.yml
diff --git a/scripts/master-ubuntu-16.04.sh b/scripts/master-ubuntu-16.04.sh
new file mode 100644
index 000000000..c8adf3bcf
--- /dev/null
+++ b/scripts/master-ubuntu-16.04.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+while [ `systemctl is-active docker` != 'active' ]; do systemctl is-active docker; sleep 5; done
+kubeadm init --kubernetes-version=v1.8.2 > /root/kubeadm-init.out
+mkdir -p /root/.kube
+cp -f /etc/kubernetes/admin.conf /root/.kube/config
+chown $(id -u):$(id -g) /root/.kube/config
+kubectl apply -f /root/weave.yml
diff --git a/scripts/node-photon-v1.sh b/scripts/node-photon-v1.sh
new file mode 100644
index 000000000..4effc1b46
--- /dev/null
+++ b/scripts/node-photon-v1.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+while [ `systemctl is-active docker` != 'active' ]; do systemctl is-active docker; sleep 5; done
+kubeadm join --token {token} {ip}:6443
diff --git a/scripts/node-ubuntu-16.04.sh b/scripts/node-ubuntu-16.04.sh
new file mode 100644
index 000000000..4effc1b46
--- /dev/null
+++ b/scripts/node-ubuntu-16.04.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+while [ `systemctl is-active docker` != 'active' ]; do systemctl is-active docker; sleep 5; done
+kubeadm join --token {token} {ip}:6443
diff --git a/test-requirements.txt b/test-requirements.txt
index ae8bfc376..ae20716d3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
 tox
 flake8
+flake8-import-order
 hacking
 nose>=1.3.6
 nose-testconfig>=0.9.1