diff --git a/xos/admin.py b/xos/admin.py
new file mode 100644
index 0000000..1289587
--- /dev/null
+++ b/xos/admin.py
@@ -0,0 +1,64 @@
+from django.contrib import admin
+
+from services.fabric.models import *
+from django import forms
+from django.utils.safestring import mark_safe
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.contrib.auth.forms import ReadOnlyPasswordHashField
+from django.contrib.auth.signals import user_logged_in
+from django.utils import timezone
+from django.contrib.contenttypes import generic
+from suit.widgets import LinkedSelect
+from core.models import AddressPool
+from core.admin import ServiceAppAdmin,SliceInline,ServiceAttrAsTabInline, ReadOnlyAwareAdmin, XOSTabularInline, ServicePrivilegeInline, TenantRootTenantInline, TenantRootPrivilegeInline
+from core.middleware import get_request
+
+from functools import update_wrapper
+from django.contrib.admin.views.main import ChangeList
+from django.core.urlresolvers import reverse
+from django.contrib.admin.utils import quote
+
+#TODO this class has to be redone according to vEE needs
+class VEEServiceForm(forms.ModelForm):
+    def __init__(self,*args,**kwargs):
+        super (VEEServiceForm,self ).__init__(*args,**kwargs)
+
+    def save(self, commit=True):
+        return super(VEEServiceForm, self).save(commit=commit)
+
+    class Meta:
+        model = VEEService
+        fields = '__all__'
+
+class VEEServiceAdmin(ReadOnlyAwareAdmin):
+    model = VEEService
+    verbose_name = "VEE Service"
+    verbose_name_plural = "VEE Services"
+    list_display = ("backend_status_icon", "name", "enabled")
+    list_display_links = ('backend_status_icon', 'name', )
+    fieldsets = [(None, {'fields': ['backend_status_text', 'name','enabled','versionNumber', 'description', "view_url", "icon_url", "autoconfig", ],
+                         'classes':['suit-tab suit-tab-general']})]
+    readonly_fields = ('backend_status_text', )
+    inlines = [SliceInline,ServiceAttrAsTabInline,ServicePrivilegeInline]
+    form = VEEServiceForm
+
+    extracontext_registered_admins = True
+
+    user_readonly_fields = ["name", "enabled", "versionNumber", "description"]
+
+    suit_form_tabs =(('general', 'VEE Service Details'),
+        ('administration', 'Administration'),
+        #('tools', 'Tools'),
+        ('slices','Slices'),
+        ('serviceattrs','Additional Attributes'),
+        ('serviceprivileges','Privileges'),
+    )
+
+    suit_form_includes = (('veeadmin.html', 'top', 'administration'),
+                           )
+
+    def get_queryset(self, request):
+        return VEEService.get_service_objects_by_user(request.user)
+
+admin.site.register(VEEService, VEEServiceAdmin)
diff --git a/xos/macros.m4 b/xos/macros.m4
new file mode 100644
index 0000000..1f48f10
--- /dev/null
+++ b/xos/macros.m4
@@ -0,0 +1,84 @@
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+#    inheriting from the parent template. Until we get that figured out, use
+#    m4 macros do our inheritance
+
+define(xos_base_props,
+            no-delete:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to delete this object
+            no-create:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to create this object
+            no-update:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to update this object
+            replaces:
+                type: string
+                required: false
+                descrption: Replaces/renames this object)
+# Service
+define(xos_base_service_caps,
+            scalable:
+                type: tosca.capabilities.Scalable
+            service:
+                type: tosca.capabilities.xos.Service)
+define(xos_base_service_props,
+            kind:
+                type: string
+                default: generic
+                description: Type of service.
+            view_url:
+                type: string
+                required: false
+                description: URL to follow when icon is clicked in the Service Directory.
+            icon_url:
+                type: string
+                required: false
+                description: ICON to display in the Service Directory.
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+                description: If True then display this Service in the Service Directory.
+            public_key:
+                type: string
+                required: false
+                description: Public key to install into Instances to allows Services to SSH into them.
+            private_key_fn:
+                type: string
+                required: false
+                description: Location of private key file
+            versionNumber:
+                type: string
+                required: false
+                description: Version number of Service.)
+# Subscriber
+define(xos_base_subscriber_caps,
+            subscriber:
+                type: tosca.capabilities.xos.Subscriber)
+define(xos_base_subscriber_props,
+            kind:
+                type: string
+                default: generic
+                description: Kind of subscriber
+            service_specific_id:
+                type: string
+                required: false
+                description: Service specific ID opaque to XOS but meaningful to service)
+define(xos_base_tenant_props,
+            kind:
+                type: string
+                default: generic
+                description: Kind of tenant
+            service_specific_id:
+                type: string
+                required: false
+                description: Service specific ID opaque to XOS but meaningful to service)
+
+# end m4 macros
+
diff --git a/xos/models.py b/xos/models.py
new file mode 100644
index 0000000..43d4c62
--- /dev/null
+++ b/xos/models.py
@@ -0,0 +1,17 @@
+from django.db import models
+from core.models import Service
+import traceback
+from xos.exceptions import *
+from xos.config import Config
+
+VEE_KIND = "vee"
+
+class VEEService(Service):
+    KIND = VEE_KIND
+
+    class Meta:
+        app_label = "vee"
+        verbose_name = "VEE Service"
+
+
+    autoconfig = models.BooleanField(default=True, help_text="Autoconfigure the vEE")
diff --git a/xos/synchronizer/manifest b/xos/synchronizer/manifest
new file mode 100644
index 0000000..821e76b
--- /dev/null
+++ b/xos/synchronizer/manifest
@@ -0,0 +1,7 @@
+manifest
+vee_synchronizer_config
+start.sh
+stop.sh
+model-deps
+run.sh
+vee-synchronizer.py
diff --git a/xos/synchronizer/model-deps b/xos/synchronizer/model-deps
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/xos/synchronizer/model-deps
@@ -0,0 +1 @@
+{}
diff --git a/xos/synchronizer/run.sh b/xos/synchronizer/run.sh
new file mode 100755
index 0000000..808590b
--- /dev/null
+++ b/xos/synchronizer/run.sh
@@ -0,0 +1,2 @@
+export XOS_DIR=/opt/xos
+python vee-synchronizer.py  -C $XOS_DIR/synchronizers/vee/vee_synchronizer_config
diff --git a/xos/synchronizer/start.sh b/xos/synchronizer/start.sh
new file mode 100755
index 0000000..c33b48a
--- /dev/null
+++ b/xos/synchronizer/start.sh
@@ -0,0 +1,2 @@
+export XOS_DIR=/opt/xos
+nohup python vee-synchronizer.py  -C $XOS_DIR/synchronizers/vee/vee_synchronizer_config > /dev/null 2>&1 &
diff --git a/xos/synchronizer/steps/sync_host.yaml b/xos/synchronizer/steps/sync_host.yaml
new file mode 100644
index 0000000..0484675
--- /dev/null
+++ b/xos/synchronizer/steps/sync_host.yaml
@@ -0,0 +1,13 @@
+---
+- hosts: 127.0.0.1
+  connection: local
+
+  tasks:
+  - name: Add host entry for fabric
+    uri:
+      url: http://{{ rest_hostname }}:{{ rest_port }}/{{ rest_endpoint }}
+      method: POST
+      user: onos
+      password: rocks
+      body: '{{ rest_body }}'
+      body_format: json
\ No newline at end of file
diff --git a/xos/synchronizer/steps/sync_vee.py b/xos/synchronizer/steps/sync_vee.py
new file mode 100644
index 0000000..c9182fe
--- /dev/null
+++ b/xos/synchronizer/steps/sync_vee.py
@@ -0,0 +1,26 @@
+from synchronizers.base.syncstep import *
+from synchronizers.base.ansible_helper import *
+from services.vee.models import VEEService
+
+class SyncVEEService(SyncStep):
+    provides=[VRouterTenant]
+    observes = VEEService
+    requested_interval=30
+    playbook='sync_host.yaml'
+
+    def get_vee_onos_service(self):
+        return None
+
+    def get_node_tag(self, node, tagname):
+        return None
+
+    def fetch_pending(self, deleted):
+
+        return []
+
+    def map_sync_inputs(self, vroutertenant):
+
+        return []
+
+    def map_sync_outputs(self, controller_image, res):
+        pass
diff --git a/xos/synchronizer/stop.sh b/xos/synchronizer/stop.sh
new file mode 100755
index 0000000..6823b10
--- /dev/null
+++ b/xos/synchronizer/stop.sh
@@ -0,0 +1 @@
+pkill -9 -f vee-synchronizer.py
diff --git a/xos/synchronizer/vee-synchronizer.py b/xos/synchronizer/vee-synchronizer.py
new file mode 100644
index 0000000..84bec4f
--- /dev/null
+++ b/xos/synchronizer/vee-synchronizer.py
@@ -0,0 +1,11 @@
+#!/usr/bin/env python
+
+# This imports and runs ../../xos-observer.py
+
+import importlib
+import os
+import sys
+observer_path = os.path.join(os.path.dirname(os.path.realpath(__file__)),"../../synchronizers/base")
+sys.path.append(observer_path)
+mod = importlib.import_module("xos-synchronizer")
+mod.main()
diff --git a/xos/synchronizer/vee_synchronizer_config b/xos/synchronizer/vee_synchronizer_config
new file mode 100644
index 0000000..82e3b97
--- /dev/null
+++ b/xos/synchronizer/vee_synchronizer_config
@@ -0,0 +1,23 @@
+# Required by XOS
+[db]
+name=xos
+user=postgres
+password=password
+host=xos_db
+port=5432
+
+# Required by XOS
+[api]
+nova_enabled=True
+
+# Sets options for the synchronizer
+[observer]
+name=vee
+dependency_graph=/opt/xos/synchronizers/vee/model-deps
+steps_dir=/opt/xos/synchronizers/vee/steps
+sys_dir=/opt/xos/synchronizers/vee/sys
+logfile=console
+pretend=False
+backoff_disabled=True
+save_ansible_output=True
+proxy_ssh=False
diff --git a/xos/templates/veeadmin.html b/xos/templates/veeadmin.html
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xos/templates/veeadmin.html
diff --git a/xos/tosca/resources/veeservice.py b/xos/tosca/resources/veeservice.py
new file mode 100644
index 0000000..8a3639a
--- /dev/null
+++ b/xos/tosca/resources/veeservice.py
@@ -0,0 +1,8 @@
+from service import XOSService
+from services.vee.models import VEEService
+
+class VEEService(XOSService):
+    provides = "tosca.nodes.VEEService"
+    xos_model = VEEService
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber"]
+
diff --git a/xos/vee-onboard.yaml b/xos/vee-onboard.yaml
new file mode 100644
index 0000000..f36d750
--- /dev/null
+++ b/xos/vee-onboard.yaml
@@ -0,0 +1,21 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the vee
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+    servicecontroller#vee:
+      type: tosca.nodes.ServiceController
+      properties:
+          base_url: file:///opt/xos_services/vEE/xos/
+          # The following will concatenate with base_url automatically, if
+          # base_url is non-null.
+          models: models.py
+          synchronizer: synchronizer/manifest
+          synchronizer_run: vee-synchronizer.py
+          tosca_resource: tosca/resources/veeservice.py
+          tosca_custom_types: vee.yaml
+
diff --git a/xos/vee.m4 b/xos/vee.m4
new file mode 100644
index 0000000..4453d05
--- /dev/null
+++ b/xos/vee.m4
@@ -0,0 +1,29 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vee.m4 > vee.yaml"
+
+# include macros
+include(macros.m4)
+
+node_types:
+
+    tosca.nodes.VEEService:
+        description: >
+            CORD: The vEE Service.
+        derived_from: tosca.nodes.Root
+        capabilities:
+            xos_base_service_caps
+        properties:
+            xos_base_props
+            xos_base_service_props
+            backend_network_label:
+                type: string
+                required: false
+                description: Label that matches network used to connect HPC and BBS services.
+            dns_servers:
+                type: string
+                required: false
+            node_label:
+                type: string
+                required: false
+
diff --git a/xos/vee.yaml b/xos/vee.yaml
new file mode 100644
index 0000000..0de5f3b
--- /dev/null
+++ b/xos/vee.yaml
@@ -0,0 +1,92 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+# compile this with "m4 vee.m4 > vee.yaml"
+
+# include macros
+# Note: Tosca derived_from isn't working the way I think it should, it's not
+#    inheriting from the parent template. Until we get that figured out, use
+#    m4 macros do our inheritance
+
+
+# Service
+
+
+# Subscriber
+
+
+
+
+# end m4 macros
+
+
+
+node_types:
+
+    tosca.nodes.VEEService:
+        description: >
+            CORD: The vEE Service.
+        derived_from: tosca.nodes.Root
+        capabilities:
+            scalable:
+                type: tosca.capabilities.Scalable
+            service:
+                type: tosca.capabilities.xos.Service
+        properties:
+            no-delete:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to delete this object
+            no-create:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to create this object
+            no-update:
+                type: boolean
+                default: false
+                description: Do not allow Tosca to update this object
+            replaces:
+                type: string
+                required: false
+                descrption: Replaces/renames this object
+            kind:
+                type: string
+                default: generic
+                description: Type of service.
+            view_url:
+                type: string
+                required: false
+                description: URL to follow when icon is clicked in the Service Directory.
+            icon_url:
+                type: string
+                required: false
+                description: ICON to display in the Service Directory.
+            enabled:
+                type: boolean
+                default: true
+            published:
+                type: boolean
+                default: true
+                description: If True then display this Service in the Service Directory.
+            public_key:
+                type: string
+                required: false
+                description: Public key to install into Instances to allows Services to SSH into them.
+            private_key_fn:
+                type: string
+                required: false
+                description: Location of private key file
+            versionNumber:
+                type: string
+                required: false
+                description: Version number of Service.
+            backend_network_label:
+                type: string
+                required: false
+                description: Label that matches network used to connect HPC and BBS services.
+            dns_servers:
+                type: string
+                required: false
+            node_label:
+                type: string
+                required: false
+