diff --git a/public/main.js b/public/main.js
index d212345..9b5d98a 100644
--- a/public/main.js
+++ b/public/main.js
@@ -3,7 +3,7 @@ var Peer = window.Peer;
 var app = new Vue({
   el: '#app',
   data: {
-    peer: new Peer({
+    peer: new Peer(localStorage.getItem('yaswvc-peerId'), {
       host: '/',
       path: '/peerjs/myapp'
     }),
@@ -18,6 +18,14 @@ var app = new Vue({
     renderVideo:function(stream, selector = '#remoteVideo') {
       document.querySelector(selector).srcObject = stream;
     },
+    // createPeer: function() {
+    //   const peer = new Peer(localStorage.getItem('yaswvc-peerId'), {
+    //     host: '/',
+    //     path: '/peerjs/myapp'
+    //   });
+    //   localStorage.setItem('yaswvc-peerId', peer.id);
+    //   return peer;
+    // },
     connectToPeer: function() {
       let peerId = this.peer.id;
       this.logMessage(`Connecting to ${peerId}...`);
@@ -32,18 +40,11 @@ var app = new Vue({
 
       let call = this.peer.call(this.peerId, this.stream);
       call.on('stream', this.renderVideo);
-      // navigator.mediaDevices.getUserMedia({video: true, audio: true})
-      //   .then((stream) => {
-      //     let call = peer.call(peerId, stream);
-      //     call.on('stream', renderVideo);
-      //   })
-      //   .catch((err) => {
-      //     logMessage('Failed to get local stream', err);
-      //   });
     },
     listenForPeerEvents: function () {
       this.peer.on('open', (id) => {
         this.logMessage('My peer ID is: ' + id);
+        localStorage.setItem('yaswvc-peerId', id);
       });
       this.peer.on('error', (error) => {
         console.error(error);
@@ -165,6 +166,7 @@ var app = new Vue({
   },
   mounted() {
     console.log('VUE is alive!');
+    this.listenForPeerEvents();
     navigator.mediaDevices.enumerateDevices().then(this.gotDevices).catch(this.handleError);
     this.start();
     document.querySelector('select#audioOutput').disabled = !('sinkId' in HTMLMediaElement.prototype);