diff --git a/package.json b/package.json
index 23e2a942fa6..3c8187f423e 100644
--- a/package.json
+++ b/package.json
@@ -50,12 +50,13 @@
         "pica": "^3.0.4",
         "q": "1.4.1",
         "semver": "^4.1.0",
-        "wolfy87-eventemitter": "^5.1.0",
         "simplewebrtc": "^3.0.0",
+        "wolfy87-eventemitter": "^5.1.0",
         "xmldoc": "^0.1.2"
     },
     "devDependencies": {
         "bluebird": "^3.4.7",
+        "concurrently": "^3.5.0",
         "grunt-newer": "^1.3.0",
         "gunzip-maybe": "^1.3.1",
         "http-server": "mozilla/http-server#gzip",
@@ -65,6 +66,7 @@
         "request": "^2.69.0",
         "requirejs": "^2.3.3",
         "rimraf": "^2.6.1",
+        "signal-master": "^1.0.1",
         "sw-precache": "^5.0.0",
         "tar-fs": "^1.15.1"
     },
@@ -77,7 +79,9 @@
         "preproduction": "grunt build-browser-compressed && npm run unlocalize",
         "production": "npm start -- --gzip",
         "test": "grunt test && grunt build-browser-compressed",
-        "server": "http-server -p 8000 --cors",
+        "server:webrtc": "node node_modules/signal-master",
+        "server:static": "http-server -p 8000 --cors",
+        "server": "concurrently \"npm run server:webrtc\" \"npm run server:static\"",
         "prestart": "npm run localize && grunt build-browser-dev",
         "start": "npm run server || true",
         "poststart": "npm run unlocalize"
diff --git a/src/editor/Collaboration.js b/src/editor/Collaboration.js
index 2a3b6434718..b168af58b20 100644
--- a/src/editor/Collaboration.js
+++ b/src/editor/Collaboration.js
@@ -10,7 +10,9 @@ define(function (require, exports, module) {
             // the id/element dom element that will hold remote videos
             remoteVideosEl: 'remotesVideos',
             // immediately ask for camera access
-            autoRequestMedia: false
+            autoRequestMedia: false,
+            // TODO : Shift this to config.
+            url: "localhost:8888"
         });
         this.webrtc = webrtc;
         this.pending = []; // pending clients that need to be initialized.