diff --git a/data/class_groups/cinder_all.yaml b/data/class_groups/cinder_all.yaml
new file mode 100644
index 0000000..48434ad
--- /dev/null
+++ b/data/class_groups/cinder_all.yaml
@@ -0,0 +1,3 @@
+class_groups:
+  - cinder_controller
+  - conder_volume
diff --git a/data/class_groups/cinder_controller.yaml b/data/class_groups/cinder_controller.yaml
new file mode 100644
index 0000000..534402e
--- /dev/null
+++ b/data/class_groups/cinder_controller.yaml
@@ -0,0 +1,4 @@
+classes:
+  - cinder
+  - cinder::api
+  - cinder::scheduler
diff --git a/data/class_groups/cinder_volume.yaml b/data/class_groups/cinder_volume.yaml
new file mode 100644
index 0000000..d0c80e8
--- /dev/null
+++ b/data/class_groups/cinder_volume.yaml
@@ -0,0 +1,4 @@
+classes:
+  - cinder
+  - cinder::volume
+  - "cinder::volume::%{cinder_backend}"
diff --git a/data/class_groups/common.yaml b/data/class_groups/common.yaml
deleted file mode 100644
index afebdf7..0000000
--- a/data/class_groups/common.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-volume:
-  - cinder::volume
-  - cinder::volume::%{cinder_backend}
diff --git a/data/class_groups/compute.yaml b/data/class_groups/compute.yaml
new file mode 100644
index 0000000..467fa91
--- /dev/null
+++ b/data/class_groups/compute.yaml
@@ -0,0 +1,3 @@
+class_groups:
+  - nova_compute
+  - cinder_volume
diff --git a/data/class_groups/controller.yaml b/data/class_groups/controller.yaml
new file mode 100644
index 0000000..84b6d49
--- /dev/null
+++ b/data/class_groups/controller.yaml
@@ -0,0 +1,10 @@
+class_groups:
+  - glance_all
+  - keystone_all
+  - cinder_controller
+  - nova_controller
+  - horizon
+  # this does not go here!!!
+  - network_controller
+  - database
+  - rpc
diff --git a/data/class_groups/glance_all.yaml b/data/class_groups/glance_all.yaml
new file mode 100644
index 0000000..3ea7cb2
--- /dev/null
+++ b/data/class_groups/glance_all.yaml
@@ -0,0 +1,5 @@
+classes:
+  - glance
+  - glance::api
+  - glance::registry
+  - "glance::backend::%{glance_backend}"
diff --git a/data/class_groups/horizon.yaml b/data/class_groups/horizon.yaml
new file mode 100644
index 0000000..8cc184e
--- /dev/null
+++ b/data/class_groups/horizon.yaml
@@ -0,0 +1,4 @@
+classes:
+  - memcached
+  - horizon
+  - apache
diff --git a/data/class_groups/keystone_all.yaml b/data/class_groups/keystone_all.yaml
new file mode 100644
index 0000000..8e94c58
--- /dev/null
+++ b/data/class_groups/keystone_all.yaml
@@ -0,0 +1,7 @@
+classes:
+  - keystone
+  - keystone::roles::admin
+  # 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
diff --git a/data/class_groups/mysql_database.yaml b/data/class_groups/mysql_database.yaml
index bb5abf4..2021625 100644
--- a/data/class_groups/mysql_database.yaml
+++ b/data/class_groups/mysql_database.yaml
@@ -1,3 +1,5 @@
-mysql::server:
-mysql::config:
-mysql::server::account_security:
+classes:
+  - mysql::server
+  - mysql::config
+  - mysql::server::account_security
+  - kickstack::database::databases 
diff --git a/data/class_groups/network_controller.yaml b/data/class_groups/network_controller.yaml
new file mode 100644
index 0000000..82616ee
--- /dev/null
+++ b/data/class_groups/network_controller.yaml
@@ -0,0 +1,8 @@
+classes:
+  - "%{network_service}"
+  - "%{network_service}::plugins::%{network_plugin}"
+  - "%{network_service}::server"
+  - "%{network_service}::agents::metadata"
+  - "%{network_service}::agents::l3"
+  - "%{network_service}::agents::dhcp"
+  - "%{network_service}::agents::%{network_plugin}"
diff --git a/data/class_groups/nova_compute.yaml b/data/class_groups/nova_compute.yaml
new file mode 100644
index 0000000..714c46a
--- /dev/null
+++ b/data/class_groups/nova_compute.yaml
@@ -0,0 +1,7 @@
+classes:
+  - nova
+  - nova::compute
+  - "nova::compute::%{compute_type}"
+  - "nova::network::%{network_service}"
+  - "%{network_service}"
+  - "%{network_service}::agents::%{network_plugin}"
diff --git a/data/class_groups/nova_controller.yaml b/data/class_groups/nova_controller.yaml
new file mode 100644
index 0000000..a923aa6
--- /dev/null
+++ b/data/class_groups/nova_controller.yaml
@@ -0,0 +1,10 @@
+classes:
+  - nova
+  - nova::api
+  - nova::scheduler
+  - nova::objectstore
+  - nova::cert
+  - nova::consuleauth
+  - nova::conductor
+  - "nova::network::%{network_service}"
+  - nova::vncproxy