diff --git a/Vagrantfile b/Vagrantfile
index 539766f9..46fe2458 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,7 @@
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
-SLAVES_COUNT = 2
+SLAVES_COUNT = 3
 
 init_script = <<SCRIPT
 apt-get update
diff --git a/example-riaks.py b/example-riaks.py
index d6aaf947..f392c772 100644
--- a/example-riaks.py
+++ b/example-riaks.py
@@ -39,23 +39,8 @@ def setup_riak():
     for i, riak in enumerate(riak_services):
         signals.connect(nodes[i], riak)
 
-    joiners = []
-    for i in xrange(2):
-        num = i + 1
-        join = vr.create('riak_join_single%d' % num,
-                         'resources/riak_join_single', {})[0]
-        joiners.append(join)
-
-    for i, riak in enumerate(riak_services[:-1]):
-        signals.connect(nodes[i+1], joiners[i])
-        signals.connect(riak, joiners[i], {'riak_name': 'join_to'})
-        # signals.connect(riak, riak_joiner_service, {'riak_name': 'join_to'})
-        # signals.connect(riak, riak_joiner_service, {'ip': 'join_from'})
-
-    commiter = vr.create('riak_commit1', 'resources/riak_commit', {})[0]
-    # for joiner in joiners:
-    #     signals.connect(joiner, commiter, {'join_to': 'riak_names'})
-    signals.connect(node1, commiter)
+    for i, riak in enumerate(riak_services[1:]):
+        signals.connect(riak_services[0], riak, {'riak_name': 'join_to'})
 
     has_errors = False
     for r in locals().values():
@@ -75,29 +60,26 @@ def setup_riak():
         sys.exit(1)
 
     events = [
-        React('riak_service2', 'run', 'success', 'riak_join_single1', 'join'),
-        React('riak_service3', 'run', 'success', 'riak_join_single2', 'join'),
-        React('riak_join_single1', 'join', 'success', 'riak_commit1', 'commit'),
-        React('riak_join_single2', 'join', 'success', 'riak_commit1', 'commit')
+        Dep('riak_service2', 'run', 'success', 'riak_service3', 'join'),
+        Dep('riak_service3', 'run', 'success', 'riak_service2', 'join'),
+
+        React('riak_service1', 'run', 'success', 'riak_service2', 'join'),
+        React('riak_service1', 'run', 'success', 'riak_service3', 'join'),
+
+        React('riak_service2', 'run', 'status', 'riak_service2', 'join'),
+        React('riak_service3', 'run', 'status', 'riak_service3', 'join'),
+
+        React('riak_service3', 'join', 'success', 'riak_service1', 'commit'),
+        React('riak_service2', 'join', 'success', 'riak_service1', 'commit')
     ]
 
     for event in events:
         add_event(event)
 
-    print 'Use orch'
+    print 'Use solar changes process & orch'
     sys.exit(1)
 
 
-resources_to_run = [
-    'riak_service1',
-    'riak_service2',
-    'riak_service3',
-    # 'riak_join_single1',
-    # 'riak_join_single2',
-    # 'riak_commit1'
-]
-
-
 
 @click.group()
 def main():
@@ -108,33 +90,10 @@ def main():
 def deploy():
     setup_riak()
 
-    resources = map(resource.wrap_resource, db.get_list(collection=db.COLLECTIONS.resource))
-    resources = {r.name: r for r in resources}
-
-    for name in resources_to_run:
-        try:
-            actions.resource_action(resources[name], 'run')
-        except errors.SolarError as e:
-            print 'WARNING: %s' % str(e)
-            raise
-
-    time.sleep(10)
-
 
 @click.command()
 def undeploy():
-    resources = map(resource.wrap_resource, db.get_list(collection=db.COLLECTIONS.resource))
-    resources = {r.name: r for r in resources}
-
-    for name in reversed(resources_to_run):
-        try:
-            actions.resource_action(resources[name], 'remove')
-        except errors.SolarError as e:
-            print 'WARNING: %s' % str(e)
-
-    db.clear()
-
-    signals.Connections.clear()
+    raise NotImplemented("Not yet")
 
 
 
diff --git a/resources/riak_node/actions/commit.yml b/resources/riak_node/actions/commit.yml
index 7a7a999c..2df35f53 100644
--- a/resources/riak_node/actions/commit.yml
+++ b/resources/riak_node/actions/commit.yml
@@ -1,4 +1,5 @@
 - hosts: [{{ip}}]
   sudo: yes
   tasks:
+    - shell: sleep 120
     - shell: riak-admin cluster commit
diff --git a/resources/riak_node/actions/join.yml b/resources/riak_node/actions/join.yml
new file mode 100644
index 00000000..501d16f4
--- /dev/null
+++ b/resources/riak_node/actions/join.yml
@@ -0,0 +1,4 @@
+- hosts: [{{ip}}]
+  sudo: yes
+  tasks:
+    - shell: riak-admin cluster join {{join_to}}
diff --git a/resources/riak_node/meta.yaml b/resources/riak_node/meta.yaml
index 94e386e2..ed8c172a 100644
--- a/resources/riak_node/meta.yaml
+++ b/resources/riak_node/meta.yaml
@@ -2,6 +2,9 @@ id: riak_node
 handler: ansible
 version: 1.0.0
 actions:
+  commit: actions/commit.yml
+  run: actions/run.yml
+  join: actions/join.yml
 input:
     ip:
       schema: str!
@@ -15,3 +18,6 @@ input:
     riak_name:
       schema: str!
       value:
+    join_to:
+      schema: str
+      value: