diff --git a/index.html b/index.html
index b88e05505..a049f4fba 100644
--- a/index.html
+++ b/index.html
@@ -26,8 +26,8 @@
     <!-- Templates -->
     <script type="text/ng-template" id="signin.html">
       <div class="text-center" ng-controller="SigninController">
-        <div ng-if="!peerReady">Opening peers...</div>
-        <div ng-if="peerReady">
+        <div ng-if="!$root.peerId">Opening peers...</div>
+        <div ng-if="$root.peerId">
           <h1>Join or Create a New Connection</h1>
           <div class="col-lg-12">
             <div class="input-group">
@@ -48,11 +48,11 @@
         <h1>Joined to <span class="text-muted">{{connectionId}}</span></h1>
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h3 class="panel-title">Cosigners ({{cosigners.length}}/5)</h3>
+            <h3 class="panel-title">Cosigners ({{$root.connectedPeers.length}}/5)</h3>
           </div>
           <div class="panel-body">
             <ul>
-              <li ng-repeat="cosigner in cosigners">
+              <li ng-repeat="cosigner in $root.connectedPeers">
                 <span ng-if="cosigner == $root.peerId">You ({{$root.peerId}})</span>
                 <span ng-if="cosigner != $root.peerId">{{cosigner}}</span>
               </li>
diff --git a/js/controllers/join.js b/js/controllers/join.js
index f73ff6fbb..184244da6 100644
--- a/js/controllers/join.js
+++ b/js/controllers/join.js
@@ -2,20 +2,12 @@
 
 angular.module('cosign.join').controller('JoinController',
   function($scope, $rootScope, $routeParams, Network) {
-
-    $scope.connectionId = $routeParams.id;
-    $scope.cosigners = [];
+    $rootScope.masterId = $routeParams.id;
 
     $scope.init = function() {
       console.log('-------- init --------');
       console.log($rootScope.peerId);
-      $scope.cosigners.push($rootScope.peerId);
 
-      Network.connect($scope.connectionId, function(cosigner) {
-        console.log('----- join connect --------');
-        console.log(cosigner);
-        $scope.cosigners.push(cosigner);
-        $scope.$digest();
-      });
+      Network.connect($rootScope.masterId);
     };
   });
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index e1d24b16b..60d1b364f 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -2,21 +2,12 @@
 
 angular.module('cosign.signin').controller('SigninController',
   function($scope, $rootScope, $location, Network) {
-    $rootScope.peerId = null;
-    $scope.peerReady = false;
 
     // Init peer
-    Network.init(function(pid) {
-      $rootScope.peerId = pid;
-      $rootScope.$digest();
-
-      $scope.peerReady = true;
-      $scope.$digest();
-    });
+    Network.init();
 
     $scope.join = function(cid) {
-      console.log('------- join --------');
-      console.log(cid);
+      console.log('------- joining to ' + cid +  ' --------');
 
       var pid = cid || $rootScope.peerId;
       $location.path('join/' + pid);
diff --git a/js/services/network.js b/js/services/network.js
index d0c7bca4d..826ddd96a 100644
--- a/js/services/network.js
+++ b/js/services/network.js
@@ -1,90 +1,154 @@
 'use strict';
 
 angular.module('cosign.network')
-  .factory('NetworkTest', function() {
-    this.f = function() {
-      return 2;
-    };
-  })
-  .factory('Network', function() {
+  .factory('Network', function($rootScope) {
     var peer;
-    var connectedPeers = {};
+    $rootScope.connectedPeers = [];
+    $rootScope.connectedTo = [];
+    $rootScope.masterId = null;
+    $rootScope.peerId = null;
 
-    var _onConnect = function(c, cb) {
-      if (c.label === 'wallet') {
-        var a = peer.connections[c.peer][0];
-        console.log(peer.connections[c.peer]);
-        a.send('------ origin recived -------');
-        
-        c.on('data', function(data) {
-          console.log('------ new data ------');
-          console.log(data);
+    var _arrayDiff = function(a, b) {
+      var seen = [];
+      var diff = [];
 
+      for ( var i = 0; i < b.length; i++)
+        seen[b[i]] = true;
 
-          console.log(peer.connections);
+      for ( var i = 0; i < a.length; i++)
+        if (!seen[a[i]])
+          diff.push(a[i]);
 
+      return diff;
+    };
 
-          c.on('close', function() {
-            alert(c.peer + ' has left the wallet.');
-            delete connectedPeers[c.peer];
+    var _sender = function(pid, data) {
+      if (pid !== $rootScope.peerId) {
+        console.log('-------- sending data to: ' + pid + ' --------');
+        var conns = peer.connections[pid];
+
+        if (conns) {
+          var str = JSON.stringify({
+            sender: $rootScope.peerId,
+            data: data
           });
-        });
 
-        setTimeout(function() {
-          a.send('.........................');
-          cb(c.peer);
-        }, 1000);
+          for (var i = 0; i < conns.length; i++) {
+            var conn = conns[i];
+            conn.send(str);
+          }
+        }
       }
     };
 
-    var _init = function(cb) {
-      peer = new Peer({
-        key: 'lwjd5qra8257b9',
+    var _onData = function(data) {
+      console.log('-------- Data received --------');
+      console.log(data);
+      var obj = JSON.parse(data);
+
+      if (obj.data.peers) {
+        _connectToPeers(obj.data.peers);
+      }
+    };
+
+    var _connectToPeers = function(peers) {
+      var arrayDiff = _arrayDiff(peers, $rootScope.connectedTo);
+
+      arrayDiff.forEach(function(pid) {
+        _connect(pid);
+      });
+    };
+
+    var _init = function() {
+      peer = new Peer($rootScope.peerId, {
+        key: 'lwjd5qra8257b9', // TODO: we need our own PeerServer KEY (http://peerjs.com/peerserver)
         debug: 3
       });
 
-      peer.on('open', cb);
-    };
+      peer.on('open', function(pid) {
+        $rootScope.$apply(function() {
+          $rootScope.peerId = pid;
+          $rootScope.connectedPeers.push(pid);
+        });
+      });
 
-    var _connect = function(pid, cb) {
       peer.on('connection', function(conn) {
-        _onConnect(conn, cb);
+        if (conn.label === 'wallet') {
+          conn.on('open', function() {
+            console.log('-------- ' + conn.peer + ' conected to me --------');
+
+            if ($rootScope.masterId === $rootScope.peerId) {
+              var c = peer.connect(conn.peer, {
+                label: 'wallet',
+                serialization: 'none',
+                reliable: false,
+                metadata: { message: 'hi peer!' }
+              });
+
+              c.on('open', function() {
+                $rootScope.$apply(function() {
+                  $rootScope.connectedPeers.push(conn.peer);
+                  $rootScope.connectedTo.push(conn.peer);
+                });
+
+                _send($rootScope.connectedPeers, { peers: $rootScope.connectedPeers });
+              });
+            }
+          });
+        }
       });
 
-      var c = peer.connect(pid, {
-        label: 'wallet',
-        serialization: 'none',
-        reliable: false,
-        metadata: { message: 'hi! cosigners' }
-      });
-
-      c.on('open', function() {
-        c.send('-------oopen-------');
-      });
-
-      c.on('data', function(data) {
-        if (data)
-        console.log(data);
-      });
-
-      c.on('error', function(err) {
-        console.error(err);
+      peer.on('close', function() {
+        console.log('------- connection closed ---------');
       });
     };
 
-    var _sendTo = function(pid, data) {
-      if (typeof pids === 'string') {
-        // just send
-      } else if (typeof pids === 'array') {
-        // iter
+    var _connect = function(pid) {
+      if (pid !== $rootScope.peerId) {
+        console.log('------- conecting to ' + pid + ' ------');
+        var c = peer.connect(pid, {
+          label: 'wallet',
+          serialization: 'none',
+          reliable: false,
+          metadata: { message: 'hi copayer!' }
+        });
+
+        c.on('open', function() {
+          console.log('-------- I\'m connected to ' + pid + ' ------');
+          console.log($rootScope.connectedPeers);
+          console.log($rootScope.connectedTo);
+
+          $rootScope.$apply(function() {
+            $rootScope.connectedPeers.push(pid);
+            $rootScope.connectedTo.push(pid);
+          });
+
+          console.log($rootScope.connectedPeers);
+          console.log($rootScope.connectedTo);
+        });
+
+        c.on('data', _onData);
+
+        c.on('error', function(err) {
+          console.error('-------- Error --------')
+        });
+      }
+    };
+
+    var _send = function(pids, data) {
+      if (Array.isArray(pids)) {
+        pids.forEach(function(pid) {
+          _sender(pid, data);
+        }); 
+      } else if (typeof pids === 'string') {
+        _sender(pid, data);
       }
-      console.log(data);
     };
 
     return {
       init: _init,
       connect: _connect,
-      sendTo: _sendTo
+      send: _send
     } 
   });