diff --git a/API.js b/API.js
index 76f30a29e..a97c821a2 100644
--- a/API.js
+++ b/API.js
@@ -169,13 +169,13 @@ API.prototype.getCommands = decorate('getCommands', [
   ['callback', 'function']
   ]);
 
-API.prototype._cmd_getWalletIds = function(callback) {
+API.prototype._cmd_getWallets = function(callback) {
   var self = this;
 
-  return callback(null, self.walletFactory.getWalletIds());
+  return callback(null, self.walletFactory.getWallets());
 };
 
-API.prototype.getWalletIds = decorate('getWalletIds', [
+API.prototype.getWallets = decorate('getWallets', [
   ['callback', 'function']
   ]);
 
diff --git a/index.html b/index.html
index 07b8f19d0..fcf62cf8b 100644
--- a/index.html
+++ b/index.html
@@ -17,12 +17,12 @@
             <a href="#"><img src="./img/logo-negative.svg" alt="Copay" width="130" /></a>
           </figure>
           <div class="text-right" ng-show="$root.wallet">
-            <div ng-if="$root.wallet.name">
-              <h5>Wallet: {{$root.wallet.name}} &lt;{{$root.wallet.id}}&gt;</h5>
-              <p> 
-            </div>
-            <div ng-if="!$root.wallet.name && $root.wallet.id">
-              <h5 >Wallet ID: {{$root.wallet.id}}</h5>
+            <div>
+              <h5 >
+              <span ng-if="!$root.wallet.name && $root.wallet.id">Wallet ID: {{$root.wallet.id}}</span>
+              <span ng-if="$root.wallet.name">Wallet: {{$root.wallet.name}} &lt;{{$root.wallet.id}}&gt;</span>
+              [{{$root.wallet.requiredCopayers}}-{{$root.wallet.totalCopayers}}]<br>
+            </h5>
             </div>
             <p>
                 Balance: {{totalBalance || 0}} <i class="fi-bitcoin"></i><br>
@@ -101,7 +101,7 @@
     <script type="text/ng-template" id="signin.html">
       <div class="signin" ng-controller="SigninController">
         <div data-alert class="alert-box info round" ng-show="loading">
-          Connecting to wallet...
+          Looking for peers...
         </div>
         <div ng-show="!loading">
           <div ng-show="!wallets.length">
diff --git a/js/controllers/setup.js b/js/controllers/setup.js
index a5fa11814..e867af9f0 100644
--- a/js/controllers/setup.js
+++ b/js/controllers/setup.js
@@ -34,7 +34,7 @@ angular.module('copay.setup').controller('SetupController',
         name: walletName, 
       };
       var w = walletFactory.create(opts);
-      controllerUtils.setupUxHandlers(w);
+      controllerUtils.startNetwork(w);
     };
 
   });
diff --git a/js/controllers/signin.js b/js/controllers/signin.js
index e2a8a1790..f1e8b2fe4 100644
--- a/js/controllers/signin.js
+++ b/js/controllers/signin.js
@@ -14,7 +14,7 @@ angular.module('copay.signin').controller('SigninController',
     $scope.open = function(walletId, opts) {
       $scope.loading = true;
       var w = walletFactory.open(walletId, opts);
-      controllerUtils.setupUxHandlers(w);
+      controllerUtils.startNetwork(w);
     };
 
     $scope.join = function(secret) {
@@ -29,8 +29,13 @@ angular.module('copay.signin').controller('SigninController',
       });
 
       walletFactory.joinCreateSession(secret, function(w) {
-console.log('[signin.js.33] joinCreateSession RETURN', w); //TODO
-        controllerUtils.setupUxHandlers(w);
+        if (w) {
+          controllerUtils.startNetwork(w);
+        }
+        else {
+          $scope.loading = false;
+          controllerUtils.onErrorDigest();
+        }
       });
     };
   });
diff --git a/js/controllers/transactions.js b/js/controllers/transactions.js
index c34221bfd..37cc0dbd1 100644
--- a/js/controllers/transactions.js
+++ b/js/controllers/transactions.js
@@ -77,13 +77,15 @@ angular.module('copay.transactions').controller('TransactionsController',
 
     $scope.getTransactions = function() {
       var w   =$rootScope.wallet;
-      var addresses = w.getAddressesStr();
+      if (w) {
+        var addresses = w.getAddressesStr();
 
-      if (addresses.length > 0) {
-        w.blockchain.getTransactions(addresses, function(txs) {
-          $scope.blockchain_txs = txs;
-          $rootScope.$digest();
-        });
+        if (addresses.length > 0) {
+          w.blockchain.getTransactions(addresses, function(txs) {
+            $scope.blockchain_txs = txs;
+            $rootScope.$digest();
+          });
+        }
       }
     };
 
diff --git a/js/models/core/PublicKeyRing.js b/js/models/core/PublicKeyRing.js
index b556c0244..ee21a9e65 100644
--- a/js/models/core/PublicKeyRing.js
+++ b/js/models/core/PublicKeyRing.js
@@ -92,17 +92,25 @@ PublicKeyRing.prototype.getCopayerId = function(i) {
   return this.copayerIds[i];
 };
 
-PublicKeyRing.prototype.myCopayerId = function(i) {
-  return this.getCopayerId(0);
-};
-
 PublicKeyRing.prototype.registeredCopayers = function () {
   return this.copayersBIP32.length;
 };
 
-
 PublicKeyRing.prototype.isComplete = function () {
-  return this.registeredCopayers() >= this.totalCopayers;
+  return this.registeredCopayers() === this.totalCopayers;
+};
+
+PublicKeyRing.prototype.getAllCopayerIds = function() {
+  var ret = [];
+  var l = this.registeredCopayers();
+  for(var i=0; i<l; i++) {
+    ret.push(this.getCopayerId(i));
+  }
+  return ret;
+};
+
+PublicKeyRing.prototype.myCopayerId = function(i) {
+  return this.getCopayerId(0);
 };
 
 PublicKeyRing.prototype._checkKeys = function() {
diff --git a/js/models/core/Wallet.js b/js/models/core/Wallet.js
index 9a6586840..5e6e1672e 100644
--- a/js/models/core/Wallet.js
+++ b/js/models/core/Wallet.js
@@ -30,6 +30,7 @@ function Wallet(opts) {
   this.publicKeyRing.walletId = this.id;
   this.txProposals.walletId = this.id;
 
+  this.network.maxPeers = this.totalCopayers;
 }
 
 Wallet.parent = EventEmitter;
@@ -47,7 +48,6 @@ Wallet.getRandomId = function() {
 Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
   this.log('RECV PUBLICKEYRING:', data);
 
-  var shouldSend = false;
   var recipients, pkr = this.publicKeyRing;
   var inPKR = copay.PublicKeyRing.fromObj(data.publicKeyRing);
 
@@ -55,26 +55,18 @@ Wallet.prototype._handlePublicKeyRing = function(senderId, data, isInbound) {
   if (hasChanged) {
     this.log('### BROADCASTING PKR');
     recipients = null;
-    shouldSend = true;
-  }
-  // else if (isInbound  && !data.isBroadcast) {
-  //   // always replying  to connecting peer
-  //   this.log('### REPLYING PKR TO:', senderId);
-  //   recipients = senderId;
-  //   shouldSend = true;
-  // }
-
-  if (shouldSend) {
     this.sendPublicKeyRing(recipients);
+    if (this.publicKeyRing.isComplete()) {
+      this._lockIncomming();
+    }
   }
   this.store();
 };
 
 
 Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
-  this.log('RECV TXPROPOSAL:', data); //TODO
+  this.log('RECV TXPROPOSAL:', data); 
 
-  var shouldSend = false;
   var recipients;
   var inTxp = copay.TxProposals.fromObj(data.txProposals);
   var mergeInfo = this.txProposals.merge(inTxp, true);
@@ -82,18 +74,8 @@ Wallet.prototype._handleTxProposals = function(senderId, data, isInbound) {
   if (mergeInfo.hasChanged || addSeen) {
     this.log('### BROADCASTING txProposals. ');
     recipients = null;
-    shouldSend = true;
-  }
-  // else if (isInbound  && !data.isBroadcast) {
-  //   // always replying  to connecting peer
-  //   this.log('### REPLYING txProposals TO:', senderId);
-  //   recipients = senderId;
-  //   shouldSend = true;
-  // }
-
-  if (shouldSend)
     this.sendTxProposals(recipients);
-
+  }
   this.store();
 };
 
@@ -155,6 +137,10 @@ Wallet.prototype.getMyCopayerId = function() {
   return this.getCopayerId(0);
 };
 
+Wallet.prototype._lockIncomming = function() {
+  this.network.lockIncommingConnections(this.publicKeyRing.getAllCopayerIds());
+};
+
 Wallet.prototype.netStart = function() {
   var self = this;
   var net = this.network;
@@ -174,8 +160,13 @@ Wallet.prototype.netStart = function() {
   var startOpts = {
     copayerId: myId,
     signingKeyHex: self.privateKey.getSigningKey(),
+    maxPeers: self.totalCopayers,
   };
 
+  if (this.publicKeyRing.isComplete()) {
+    this._lockIncomming();
+  }
+
   net.start(startOpts, function() {
     self.emit('created', net.getPeer());
     var registered = self.getRegisteredPeerIds();
@@ -208,7 +199,6 @@ Wallet.prototype.getRegisteredPeerIds = function() {
 };
 
 Wallet.prototype.store = function(isSync) {
-  this.log('[Wallet.js.135:store:]'); //TODO
   var wallet = this.toObj();
   this.storage.setFromObj(this.id, wallet);
 
@@ -540,8 +530,7 @@ Wallet.prototype.connectTo = function(peerId) {
 };
 
 Wallet.prototype.disconnect = function() {
-
-  console.log('[Wallet.js.524] DISC'); //TODO
+  this.log('## DISCONNECTING');
   this.network.disconnect();
 };
 
diff --git a/js/models/core/WalletFactory.js b/js/models/core/WalletFactory.js
index fbf6559bf..7a2972cbe 100644
--- a/js/models/core/WalletFactory.js
+++ b/js/models/core/WalletFactory.js
@@ -149,10 +149,16 @@ WalletFactory.prototype.joinCreateSession = function(copayerId, cb) {
   //Create our PrivateK
   var privateKey = new PrivateKey({ networkName: this.networkName });
   this.log('\t### PrivateKey Initialized');
-  self.network.setCopayerId(privateKey.getId());
-  self.network.setSigningKey(privateKey.getSigningKey());
-  self.network.start({}, function() {
+  var opts = {
+    copayerId: privateKey.getId(),
+    signingKeyHex: privateKey.getSigningKey(),
+  };
+  self.network.cleanUp();
+  self.network.start(opts, function() {
     self.network.connectTo(copayerId);
+    self.network.on('onlyYou', function(sender, data) {
+      return cb();
+    });
     self.network.on('data', function(sender, data) {
       if (data.type ==='walletId') {
         data.opts.privateKey = privateKey;
diff --git a/js/models/network/WebRTC.js b/js/models/network/WebRTC.js
index 603beb28e..0176883ba 100644
--- a/js/models/network/WebRTC.js
+++ b/js/models/network/WebRTC.js
@@ -19,27 +19,42 @@ var Key         = bitcore.Key;
 
 function Network(opts) {
   var self = this;
-  opts = opts || {};
-  this.peerId = opts.peerId;
-  this.apiKey = opts.apiKey || 'lwjd5qra8257b9';
-  this.debug = opts.debug || 3;
-  this.maxPeers = opts.maxPeers || 10;
-  this.opts = {
-    key: opts.key
-  };
-  this.connections = {};
-  this.copayerForPeer = {};
+  opts                = opts || {};
+  this.apiKey         = opts.apiKey || 'lwjd5qra8257b9';
+  this.debug          = opts.debug || 3;
+  this.maxPeers       = opts.maxPeers || 10;
+  this.opts           = { key: opts.key };
 
   // For using your own peerJs server
   ['port', 'host', 'path', 'debug'].forEach(function(k) {
     if (opts[k]) self.opts[k] = opts[k];
   });
-  this.connectedPeers = [];
-  this.started = false;
+  this.cleanUp();
 }
 
 Network.parent = EventEmitter;
 
+Network.prototype.cleanUp = function() {
+  this.started = false;
+  this.connectedPeers = [];
+  this.peerId = null;
+  this.copayerId = null;
+  this.signingKey = null;
+  this.allowedCopayerIds=null;
+  this.authenticatedPeers=[];
+  this.copayerForPeer={};
+  this.connections={};
+  if (this.peer) {
+    console.log('## DESTROYING PEER INSTANCE'); //TODO
+    this.peer.disconnect();
+    this.peer.destroy();
+    this.peer = null;
+  }
+  this.closing = 0;
+};
+
+Network.parent=EventEmitter;
+
 // Array helpers
 Network._arrayDiff = function(a, b) {
   var seen = [];
@@ -83,9 +98,16 @@ Network.prototype.connectedCopayers = function() {
   return ret;
 };
 
-Network.prototype._onClose = function(peerId) {
+Network.prototype._deletePeer = function(peerId) {
+  if (this.connections[peerId]) {
+    this.connections[peerId].close();
+  }
   delete this.connections[peerId];
   this.connectedPeers = Network._arrayRemove(peerId, this.connectedPeers);
+};
+
+Network.prototype._onClose = function(peerId) {
+  this._deletePeer(peerId);
   this._notifyNetworkChange();
 };
 
@@ -99,7 +121,7 @@ Network.prototype._connectToCopayers = function(copayerIds) {
 };
 
 Network.prototype._sendHello = function(copayerId) {
-  console.log('#### SENDING HELLO TO ', copayerId);
+  console.log('### SENDING HELLO TO ', copayerId);
   this.send(copayerId, {
     type: 'hello',
     copayerId: this.copayerId,
@@ -107,7 +129,7 @@ Network.prototype._sendHello = function(copayerId) {
 };
 
 Network.prototype._sendCopayers = function(copayerIds) {
-  console.log('#### SENDING PEER LIST: ', this.connectedPeers,this.connectedCopayers(), ' TO ', copayerIds?copayerIds: 'ALL');
+  console.log('### SENDING PEER LIST: ', this.connectedPeers,this.connectedCopayers(), ' TO ', copayerIds?copayerIds: 'ALL');
   this.send(copayerIds, {
     type: 'copayers',
     copayers: this.connectedCopayers(),
@@ -128,6 +150,8 @@ Network.prototype._addCopayer = function(copayerId, isInbound) {
   }
 };
 
+
+
 Network.prototype._onData = function(data, isInbound, peerId) {
   var sig, payload;
   try { 
@@ -136,45 +160,53 @@ Network.prototype._onData = function(data, isInbound, peerId) {
     payload= dataObj.payload;
 
   } catch (e) {
-    console.log('### ERROR ON DATA: "%s" ', data, isInbound, e);
+    console.log('### ERROR IN DATA: "%s" ', data, isInbound, e); 
+    this._deletePeer(peerId);
     return;
   };
 
-  console.log('### RECEIVED INBOUND?:%s TYPE: %s FROM %s: sig:%s', 
-              isInbound, payload.type, peerId, sig, payload); 
-  var self=this;
+  console.log('### RECEIVED INBOUND?:%s TYPE: %s FROM %s', 
+              isInbound, payload.type, peerId, payload); 
 
   // TODO _func
   if(payload.type === 'hello') {
-    var thisSig = this._sign(payload, this.copayerId);
+    var thisSig = this._signHMAC(payload, this.copayerId);
     if (thisSig !== sig) {
-      console.log('#### Peer sent WRONG hello. Closing connection.');
+      console.log('#### Peer sent WRONG hello signature. Closing connection.');
+      this._deletePeer(peerId);
       return;
     }
+    if (this.allowedCopayerIds && !this.allowedCopayerIds[payload.copayerId]) {
+      console.log('#### Peer is not on the allowedCopayerIds. Closing connection', 
+                  this.allowedCopayerIds, payload.copayerId);
+      this._deletePeer(peerId);
+      return;
+    }
+
     console.log('#### Peer sent signed hello. Setting it up.'); //TODO
     this._addCopayer(payload.copayerId, isInbound);
+    this._setPeerAuthenticated(peerId);
     this._notifyNetworkChange( isInbound ? payload.copayerId : null);
     this.emit('open');
     return;
   }
 
-  if (!this.copayerForPeer[peerId]) {
-    console.log('### Discarting message from unknow peer: ', peerId); //TODO
+  //copayerForPeer is populated also in 'copayers' message, so we need authenticatedPeer
+  if (isInbound && (!this.copayerForPeer[peerId] || !this.authenticatedPeers[peerId])) {
+    console.log('### Closing connection from unknown/unauthenticated peer: ', peerId);
+    this._deletePeer(peerId);
     return;
   }
 
-  // check sig
-  if (this.copayerForPeer[peerId]) {
-    var copayerIdBuf = new Buffer(this.copayerForPeer[peerId],'hex');
-    if (!bitcore.Message.verifyWithPubKey( copayerIdBuf, JSON.stringify(payload), 
-      new Buffer(sig,'hex'))) {
-
-      console.log('[WebRTC.js.152] SIGNATURE VERIFICATION FAILED!!'); //TODO
-      // TODO close connection
-      return;
-    }
+  var copayerIdBuf = new Buffer(this.copayerForPeer[peerId],'hex');
+  if (!bitcore.Message.verifyWithPubKey( copayerIdBuf, JSON.stringify(payload), 
+    new Buffer(sig,'hex'))) {
+    console.log('[WebRTC.js.152] SIGNATURE VERIFICATION FAILED!!'); //TODO
+    this._deletePeer(peerId);
+    return;
   }
   
+  var self=this;
   switch(payload.type) {
     case 'copayers':
       this._addCopayer(this.copayerForPeer[peerId], false);
@@ -192,24 +224,27 @@ Network.prototype._onData = function(data, isInbound, peerId) {
 Network.prototype._checkAnyPeer = function() {
   if (!this.connectedPeers.length) {
     console.log('EMIT openError: no more peers, not even you!'); 
-    this._cleanUp();
+    this.cleanUp();
     this.emit('openError');
   }
-}
+  if (this.connectedPeers.length === 1) {
+    this.emit('onlyYou');
+  }
+};
 
 Network.prototype._setupConnectionHandlers = function(dataConn, isInbound) {
   var self = this;
 
   dataConn.on('open', function() {
     if (!Network._inArray(dataConn.peer, self.connectedPeers)
-        && !  self.connections[dataConn.peer]) {
+        && !self.connections[dataConn.peer]) {
 
       self.connections[dataConn.peer] = dataConn;
 
       console.log('### DATA CONNECTION READY: %s (inbound: %s) AUTHENTICATING...',
         dataConn.peer, isInbound);
 
-      // The connection peer send hello (with signature)
+      // The connecting peer send hello (with signature)
       if(!isInbound) 
         self._sendHello(self.copayerForPeer[dataConn.peer]);      
     }
@@ -236,7 +271,6 @@ Network.prototype._setupConnectionHandlers = function(dataConn, isInbound) {
 };
 
 Network.prototype._notifyNetworkChange = function(newCopayerId) {
-  console.log('[WebRTC.js.164:_notifyNetworkChange:]', newCopayerId); //TODO
   this.emit('networkChange', newCopayerId);
 };
 
@@ -276,11 +310,21 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
 
 Network.prototype._addCopayerMap = function(peerId, copayerId) {
   if (!this.copayerForPeer[peerId]) {
-    console.log('ADDING COPAYER MAPPING: %s => %s', peerId, copayerId); //TODO
-    this.copayerForPeer[peerId]=copayerId;
+    if(Object.keys(this.copayerForPeer).length < this.maxPeers) {
+      console.log('Adding peer/copayer',  peerId, copayerId); //TODO
+      this.copayerForPeer[peerId]=copayerId;
+    }
+    else {
+      console.log('### maxPeerLimit of %d reached. Refusing to add more copayers.', this.maxPeers); //TODO
+    }
   }
 };
 
+
+Network.prototype._setPeerAuthenticated = function(peerId) {
+  this.authenticatedPeers[peerId] = 1;
+};
+
 Network.prototype.setCopayerId = function(copayerId) {
   if (this.started) {
     throw new Error('network already started: can not change peerId')
@@ -303,14 +347,16 @@ Network.prototype.setSigningKey = function(keyHex) {
 };
 
 Network.prototype.peerFromCopayer = function(hex) {
-  return util.sha256(new Buffer(hex,'hex')).toString('hex');
+  var SIN = bitcore.SIN;
+  return new SIN(new Buffer(hex,'hex')).toString();
 };
 
 Network.prototype.start = function(opts, openCallback) {
   opts = opts || {};
-  var self = this;
-  if (this.started)  return openCallback();
-  opts.connectedPeers = opts.connectedPeers || [];
+
+  if (this.started) return openCallback();
+
+  this.maxPeers = opts.maxPeers || this.maxPeers;
 
   if (!this.copayerId)
     this.setCopayerId(opts.copayerId);
@@ -320,7 +366,8 @@ Network.prototype.start = function(opts, openCallback) {
   console.log('CREATING PEER INSTANCE:', this.peerId); //TODO
   this.peer = new Peer(this.peerId, this.opts);
   this._setupPeerHandlers(openCallback);
-  for (var i = 0; i < opts.connectedPeers.length; i++) {
+  opts.connectedPeers = opts.connectedPeers || [];
+  for (var i = 0; i<opts.connectedPeers.length; i++) {
     var otherPeerId = opts.connectedPeers[i];
     this.connectTo(otherPeerId);
   }
@@ -328,26 +375,28 @@ Network.prototype.start = function(opts, openCallback) {
 };
 
 
-Network.prototype._sign = function(payload, copayerId) {
+Network.prototype._signHMAC = function(payload, copayerId) {
+  var str = JSON.stringify(payload);
+  if (payload.type !=='hello') 
+    throw new Error ('HMAC only for hello messages')
+  return util.sha512hmac(
+    new Buffer(str), 
+    new Buffer(copayerId,'hex')
+  ).toString('hex');
+};
+
+Network.prototype._signECDSA = function(payload) {
   var ret='';
   var str = JSON.stringify(payload);
-  if (payload.type ==='hello') {
-    ret = (
-      util.sha512hmac(
-      new Buffer(str), 
-      new Buffer(copayerId,'hex')
-    )).toString('hex');
-  }
-  else {
-    if (!this.signingKey)
-      throw new Error ('no key to sign messages :(');
-    ret = bitcore.Message.sign(
-      str, 
-      this.signingKey
-    ).toString('hex');
-  }
-  return ret;
-}
+  if (!this.signingKey)
+    throw new Error ('no key to sign messages :(');
+
+  return bitcore.Message.sign(
+    str, 
+    this.signingKey
+  ).toString('hex');
+};
+
 Network.prototype.getOnlinePeerIDs = function() {
   return this.connectedPeers;
 };
@@ -356,13 +405,13 @@ Network.prototype.getPeer = function() {
   return this.peer;
 };
 
-Network.prototype._sendToOne = function(copayerId, payload, cb) {
+Network.prototype._sendToOne = function(copayerId, payload, sig, cb) {
   var peerId = this.peerFromCopayer(copayerId);
   if (peerId !== this.peerId) {
     var dataConn = this.connections[peerId];
     if (dataConn) {
       var str = JSON.stringify({
-        sig: this._sign(payload, copayerId),
+        sig: sig,
         payload: payload 
       });
       dataConn.send(str);
@@ -381,17 +430,26 @@ Network.prototype.send = function(copayerIds, payload, cb) {
     payload.isBroadcast = 1;
   }
 
+  var sig;
+  if (payload.type === 'hello') {
+    var hisId = copayerIds; 
+    sig=this._signHMAC(payload,hisId);
+  }
+  else  {
+    sig=this._signECDSA(payload);
+  }
+
   if (Array.isArray(copayerIds)) {
     var l = copayerIds.length;
     var i = 0;
     copayerIds.forEach(function(copayerId) {
-      self._sendToOne(copayerId, payload, function () {
+      self._sendToOne(copayerId, payload, sig, function () {
         if (++i === l && typeof cb === 'function') cb();
       });
     });
   }
   else if (typeof copayerIds === 'string')
-    self._sendToOne(copayerIds, payload, cb);
+    self._sendToOne(copayerIds, payload, sig, cb);
 };
 
 Network.prototype.connectTo = function(copayerId) {
@@ -399,7 +457,7 @@ Network.prototype.connectTo = function(copayerId) {
   var peerId = this.peerFromCopayer(copayerId);
   this._addCopayerMap(peerId,copayerId);
 
-  console.log('### STARTING CONNECTION TO:', peerId, copayerId);
+  console.log('### STARTING CONNECTION TO:\n\t'+ peerId+"\n\t"+ copayerId);
   var dataConn = this.peer.connect(peerId, {
     serialization: 'none',
     reliable: true,
@@ -408,28 +466,21 @@ Network.prototype.connectTo = function(copayerId) {
   self._setupConnectionHandlers(dataConn, false);
 };
 
-Network.prototype._cleanUp = function() {
-  var self = this;
-  self.connectedPeers = [];
-  self.started = false;
-  self.peerId = null;
-  self.copayerId = null;
-  self.signingKey = null;
-  if (self.peer) {
-    console.log('## DESTROYING PEER INSTANCE'); //TODO
-    self.peer.disconnect();
-    self.peer.destroy();
-    self.peer = null;
+Network.prototype.lockIncommingConnections = function(allowedCopayerIdsArray) {
+  if (!this.allowedCopayerIds) 
+    console.log('[webrtc] #### LOCKING INCOMMING CONNECTIONS'); 
+  
+  this.allowedCopayerIds={};
+  for(var i in allowedCopayerIdsArray) {
+    this.allowedCopayerIds[ allowedCopayerIdsArray[i] ] = 1;
   }
-  self.closing = 0;
 };
 
-
 Network.prototype.disconnect = function(cb, forced) {
   var self = this;
   self.closing = 1;
   self.send(null, { type: 'disconnect' }, function(){
-    self._cleanUp();
+    self.cleanUp();
     if (typeof cb === 'function') cb();
   });
 };
diff --git a/js/services/controllerUtils.js b/js/services/controllerUtils.js
index 1b4f2f9dd..0132b0f7f 100644
--- a/js/services/controllerUtils.js
+++ b/js/services/controllerUtils.js
@@ -34,7 +34,8 @@ angular.module('copay.controllerUtils')
       root.onError(scope);
       $rootScope.$digest();
     }
-    root.setupUxHandlers = function(w) {
+
+    root.startNetwork = function(w) {
       var handlePeerVideo = function(err, peerID, url) {
         if (err) {
           return;
@@ -55,7 +56,6 @@ angular.module('copay.controllerUtils')
         root.updateBalance();
       });
       w.on('refresh', function() {
-        console.log('[controllerUtils.js] Refreshing'); //TODO
         root.updateBalance();
       });
       w.on('openError', root.onErrorDigest);
diff --git a/test/mocks/FakeStorage.js b/test/mocks/FakeStorage.js
index 5ab31ef54..4e12e25fb 100644
--- a/test/mocks/FakeStorage.js
+++ b/test/mocks/FakeStorage.js
@@ -23,7 +23,7 @@ FakeStorage.prototype.clear = function() {
   delete this['storage'];
 }
 
-FakeStorage.prototype.getWalletIds = function() {
+FakeStorage.prototype.getWallets = function() {
   return [];
 };
 
diff --git a/test/test.API.js b/test/test.API.js
index 96795f75a..8cbd450cf 100644
--- a/test/test.API.js
+++ b/test/test.API.js
@@ -110,10 +110,10 @@ describe('API', function() {
     });
   });
 
-  describe('#getWalletIds', function() {
+  describe('#getWallets', function() {
     it('should get the wallet ids', function(done) {
       var api = new API({Storage: Storage});
-      api.getWalletIds(function(err, result) {
+      api.getWallets(function(err, result) {
         result.length.should.be.greaterThan(-1);
         done();
       });
diff --git a/test/test.Wallet.js b/test/test.Wallet.js
index 73985c867..9fdaaac4e 100644
--- a/test/test.Wallet.js
+++ b/test/test.Wallet.js
@@ -5,7 +5,7 @@ var should = chai.should();
 var copay = copay || require('../copay');
 var Wallet = require('../js/models/core/Wallet');
 var Storage= require('./mocks/FakeStorage');
-var Network= copay.WebRTC;
+var Network= require('./mocks/FakeNetwork');
 var Blockchain= copay.Insight;
 
 var addCopayers = function (w) {