diff --git a/.gitmodules b/.gitmodules
index b75069b..e0c9d14 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,3 +19,30 @@
 [submodule "modules/create_resources"]
 	path = modules/create_resources
 	url = git://github.com/puppetlabs/puppetlabs-create_resources.git
+[submodule "modules/concat"]
+	path = modules/concat
+	url = git://github.com/puppetlabs/puppet-concat
+[submodule "modules/keystone"]
+	path = modules/keystone
+	url = git://github.com/puppetlabs/puppetlabs-keystone
+[submodule "modules/rsync"]
+	path = modules/rsync
+	url = git://github.com/puppetlabs/puppet-rsync
+[submodule "modules/ssh"]
+	path = modules/ssh
+	url = git://github.com/saz/puppet-ssh
+[submodule "modules/memcached"]
+	path = modules/memcached
+	url = git://github.com/saz/puppet-memcached
+[submodule "modules/xinetd"]
+	path = modules/xinetd
+	url = git://github.com/ghoneycutt/xinetd
+[submodule "modules/swift"]
+	path = modules/swift
+	url = git://github.com/puppetlabs/puppetlabs-swft
+[submodule "puppetlabs-keystone"]
+	path = puppetlabs-keystone
+	url = git://github.com/puppetlabs/puppetlabs-keystone
+[submodule "modules/vcsrepo"]
+	path = modules/vcsrepo
+	url = git://github.com/puppetlabs/puppet-vcsrepo
diff --git a/modules/apt b/modules/apt
index a11af50..482609f 160000
--- a/modules/apt
+++ b/modules/apt
@@ -1 +1 @@
-Subproject commit a11af502cd839efbdab56da95aa1965e75d7ae1c
+Subproject commit 482609fa39596f2cd743ff48516fdf339bc612fa
diff --git a/modules/concat b/modules/concat
new file mode 160000
index 0000000..031bf26
--- /dev/null
+++ b/modules/concat
@@ -0,0 +1 @@
+Subproject commit 031bf261289dcbb32e63b053ed5b3a82117698c0
diff --git a/modules/create_resources b/modules/create_resources
deleted file mode 160000
index 28584b0..0000000
--- a/modules/create_resources
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 28584b0ed187fda119b3c44d468cafe7d3e1e980
diff --git a/modules/glance b/modules/glance
index f8b9225..cfc9516 160000
--- a/modules/glance
+++ b/modules/glance
@@ -1 +1 @@
-Subproject commit f8b922582dbd6bf22eda39f1281cf9f5685dc236
+Subproject commit cfc951664aa2fdd1ae5850224e644fcc8c99a7a3
diff --git a/modules/keystone b/modules/keystone
new file mode 160000
index 0000000..fa7e3a8
--- /dev/null
+++ b/modules/keystone
@@ -0,0 +1 @@
+Subproject commit fa7e3a87fce17719b7cb07f42fee613456f2feae
diff --git a/modules/memcached b/modules/memcached
new file mode 160000
index 0000000..35a1341
--- /dev/null
+++ b/modules/memcached
@@ -0,0 +1 @@
+Subproject commit 35a1341390692a1c4ee4981c5dbe328d40c0a19a
diff --git a/modules/mysql b/modules/mysql
index 29bdca5..e8efdca 160000
--- a/modules/mysql
+++ b/modules/mysql
@@ -1 +1 @@
-Subproject commit 29bdca5a76ee40f3441b8192d68275ac58f7bc32
+Subproject commit e8efdca81e63b1da00107d522dd9c87f32675bb9
diff --git a/modules/nova b/modules/nova
index 807a437..1ddbe28 160000
--- a/modules/nova
+++ b/modules/nova
@@ -1 +1 @@
-Subproject commit 807a43747117f2d9251b049ca5a95ff8d722ccf6
+Subproject commit 1ddbe28961fc26bfa149279239586f0c8775b174
diff --git a/modules/openstack/manifests/repo/diablo.pp b/modules/openstack/manifests/repo/diablo.pp
deleted file mode 100644
index 3a5a73f..0000000
--- a/modules/openstack/manifests/repo/diablo.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class openstack::repo::diablo {
-  apt::ppa { 'ppa:openstack-release/2011.3': }
-}
diff --git a/modules/rabbitmq b/modules/rabbitmq
index 875ab94..a12915d 160000
--- a/modules/rabbitmq
+++ b/modules/rabbitmq
@@ -1 +1 @@
-Subproject commit 875ab949067998332f3cc5961b7d0e8fa51d312d
+Subproject commit a12915dd4a6bb91294246040c0f2e12215974548
diff --git a/modules/rsync b/modules/rsync
new file mode 160000
index 0000000..139fb4c
--- /dev/null
+++ b/modules/rsync
@@ -0,0 +1 @@
+Subproject commit 139fb4c7d3f7cb6a12b47c2db202fe03096b561c
diff --git a/modules/ssh b/modules/ssh
new file mode 160000
index 0000000..bc4eda6
--- /dev/null
+++ b/modules/ssh
@@ -0,0 +1 @@
+Subproject commit bc4eda65af0232000605483fa6281e8e77c4bf70
diff --git a/modules/stdlib b/modules/stdlib
index 9560b63..a0e27cd 160000
--- a/modules/stdlib
+++ b/modules/stdlib
@@ -1 +1 @@
-Subproject commit 9560b6336cc983b65aaff909f4fb2e983dfd7012
+Subproject commit a0e27cd5a3bfd2fe55c9be64a435e93853815667
diff --git a/modules/swift b/modules/swift
new file mode 160000
index 0000000..f802df8
--- /dev/null
+++ b/modules/swift
@@ -0,0 +1 @@
+Subproject commit f802df8e5aea46685ba5d7a97b7b31f18aafeae7
diff --git a/modules/vcsrepo b/modules/vcsrepo
new file mode 160000
index 0000000..462b1d6
--- /dev/null
+++ b/modules/vcsrepo
@@ -0,0 +1 @@
+Subproject commit 462b1d69bbc5d6c171dcee02a3d88d304acd630e
diff --git a/modules/xinetd b/modules/xinetd
new file mode 160000
index 0000000..f4f32fb
--- /dev/null
+++ b/modules/xinetd
@@ -0,0 +1 @@
+Subproject commit f4f32fbb4af7bd12aa70da220b3c73302c4862af
diff --git a/scripts/blank.sh b/scripts/blank.sh
new file mode 100644
index 0000000..a9bf588
--- /dev/null
+++ b/scripts/blank.sh
@@ -0,0 +1 @@
+#!/bin/bash
diff --git a/scripts/install-pe-master.sh b/scripts/install-pe-master.sh
new file mode 100644
index 0000000..57dc965
--- /dev/null
+++ b/scripts/install-pe-master.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules --debug
+curl https://s3.amazonaws.com/pe-builds/released/2.0.1/puppet-enterprise-2.0.1-el-6-i386.tar.gz 
diff --git a/scripts/run-master.sh b/scripts/run-master.sh
new file mode 100755
index 0000000..32f5f6f
--- /dev/null
+++ b/scripts/run-master.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+puppet apply /vagrant/manifests/setup_agent.pp --modulepath /vagrant/modules --debug
+puppet apply /vagrant/manifests/site.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs --debug --trace
diff --git a/scripts/run-swift-all.sh b/scripts/run-swift-all.sh
new file mode 100755
index 0000000..ee9996c
--- /dev/null
+++ b/scripts/run-swift-all.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+# TODO fix this, the image that I am using is broken
+apt-get update
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules --debug
+puppet apply /vagrant/modules/swift/examples/all.pp --modulepath /vagrant/modules --graph --certname $* --graphdir /vagrant/graphs --debug --trace
diff --git a/scripts/run-swift-multi.sh b/scripts/run-swift-multi.sh
new file mode 100755
index 0000000..1b54547
--- /dev/null
+++ b/scripts/run-swift-multi.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+apt-get update
+puppet apply /vagrant/manifests/hosts.pp --modulepath /vagrant/modules --debug
+puppet agent --server puppetmaster --certname $* --debug --trace --test --pluginsync true