diff --git a/Puppetfile b/Puppetfile
index cc5a153..705ef21 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -80,7 +80,6 @@ mod 'puppetlabs/puppetdb', :git => "#{base_url}/puppetlabs/puppetlabs-puppetdb",
 mod 'puppetlabs/vcsrepo', :git => "#{base_url}/puppetlabs/puppetlabs-vcsrepo", :ref => 'master'
 mod 'ripienaar/ruby-puppetdb', :git => "#{base_url}/ripienaar/ruby-puppetdb"
 mod 'ripienaar/catalog-diff', :git => "#{base_url}/ripienaar/puppet-catalog-diff", :ref => 'master'
-mod 'hastexo/kickstack', :git => "#{base_url}/bodepd/kickstack", :ref => 'origin/data_refactor'
 # do I really need this firewall module?
 mod 'puppetlabs/firewall', :git => "#{base_url}/puppetlabs/puppetlabs-firewall", :ref => 'master'
 # stephenrjohnson
diff --git a/data/class_groups/keystone_all.yaml b/data/class_groups/keystone_all.yaml
index 8e94c58..07e3a9f 100644
--- a/data/class_groups/keystone_all.yaml
+++ b/data/class_groups/keystone_all.yaml
@@ -4,4 +4,4 @@ classes:
   # the endpoint additions and database additions
   # are a little difficult for me
   # I am not sure how it fits into the ideal model
-  - kickstack::keystone::endpoints
+  - coi::profiles::openstack::endpoints
diff --git a/data/class_groups/mysql_database.yaml b/data/class_groups/mysql_database.yaml
index 09daf47..86a2148 100644
--- a/data/class_groups/mysql_database.yaml
+++ b/data/class_groups/mysql_database.yaml
@@ -1,4 +1,4 @@
 classes:
   - mysql::server
   - mysql::server::account_security
-  - kickstack::database::databases 
+  - coi::profiles::openstack::databases::mysql
diff --git a/data/config.yaml b/data/config.yaml
index 7823cf3..0be9e46 100644
--- a/data/config.yaml
+++ b/data/config.yaml
@@ -28,7 +28,8 @@ enabled_services:
   - cinder
   - keystone
   - nova
-  - network
+  # should I be able to interpolate this?
+  - quantum
   - swift
 
 operatingsystem: ubuntu
diff --git a/data/data_mappings/common.yaml b/data/data_mappings/common.yaml
index 17fe936..b206269 100644
--- a/data/data_mappings/common.yaml
+++ b/data/data_mappings/common.yaml
@@ -31,3 +31,6 @@ rpc_user:
   - neutron::rabbit_user
   - quantum::qpid_username
   - neutron::qpid_username
+enabled_services:
+  - coi::profiles::openstack::endpoints::enabled_services
+  - coi::profiles::openstack::databases::mysql::enabled_services
diff --git a/data/hiera_data/common.yaml b/data/hiera_data/common.yaml
index 3fa9ffa..234606d 100644
--- a/data/hiera_data/common.yaml
+++ b/data/hiera_data/common.yaml
@@ -8,6 +8,15 @@ private_interface: eth1
 external_interface: eth2
 puppet::master::version: '3.2.3-1puppetlabs1'
 
+enabled_services:
+  - glance
+  - cinder
+  - keystone
+  - nova
+  # should I be able to interpolate this?
+  - quantum
+  - swift
+
 # openstack parameters
 admin_email: root@localhost
 rpc_user: openstack_rabbit_user