diff --git a/config.js b/config.js
index b8c6500..1e0b9f6 100644
--- a/config.js
+++ b/config.js
@@ -1,21 +1,25 @@
 var environment = {
     path : '/usr/share/cybafelo',
     protocol : 'https',
-    localEnvironment : 'dev',
-    localDomain : 'cybafelo.local',
-    remoteEnvironment : 'live',
-    remoteDomain : 'cybafelo.com'
+    websocketProtocol : 'wss',
+    websocketApp : 'r3-websocket',
+    context : 'dev',
+    domain : 'cybafelo.local',
+    remoteDomain : 'cybafelo.com',
+    remoteEnvironment : 'live'
 };
 
-var protocol        	= environment.protocol;
-var localEnvironment    = environment.localEnvironment;
-var localDomain         = environment.localDomain;
+var protocol            = environment.protocol;
+var context             = environment.context;
+var domain              = environment.domain;
+var remoteDomain        = environment.remoteDomain;
 var remoteEnvironment   = environment.remoteEnvironment;
-var remoteDomain    	= environment.remoteDomain;
+var websocketProtocol   = environment.websocketProtocol;
+var websocketApp     = environment.websocketApp;
 
 var config = {
     editor: {
-        url: protocol + '://' + localEnvironment + '-r3-3ditor.' + localDomain,
+        url: protocol + '://' + context + '-r3-3ditor.' + domain,
         default: {
             platform: 'cybafelo',
             account: 'root',
@@ -24,13 +28,21 @@ var config = {
         }
     },
     api: {
-        url: protocol + '://' + localEnvironment + '-r3-api.' + localDomain,
+        url: protocol + '://' + context + '-r3-api.' + domain,
         remoteUrl: protocol + '://' + remoteEnvironment + '-r3-api.' + remoteDomain,
 		uploadPath: '/uploads',
 		clientPassword: '"kent sent me" motherfucker!'
     },
+    websocket: {
+        protocol : websocketProtocol,
+        domain : domain,
+        context : context,
+        application: websocketApp,
+        host : context + '-' + websocketApp + '.' + domain,
+        url : websocketProtocol + '://' + context + '-' + websocketApp + '.' + domain
+    },
     portal: {
-        url: protocol + '://' + localEnvironment + '-r3-portal.' + localDomain
+        url: protocol + '://' + context + '-r3-portal.' + domain
     },
     db: {},
     environment : environment
diff --git a/secure.js b/secure.js
index d22e50e..27bad6c 100644
--- a/secure.js
+++ b/secure.js
@@ -1,24 +1,14 @@
 var secure = {
-    editor: {
-        port: 3103,
-        debugPort: 3203,
-        cluster: false
-    },
     api: {
         port: 3104,
         debugPort: 3204,
-        cluster: false,
-        mailer: {
-            host: 'localhost',
-            port: 9025,
-            secure: false,
-            debug: true,
-            ignoreTLS: true
-        },
-        sessionKey: 'iJswK29klj20Jos02mJK8ud9239j23',
         customCodePath: '/usr/share/cybafelo/r3-custom-code',
 	    serverPassword: '"kent sent me" motherfucker!'
     },
+    websocket: {
+        port: 3105,
+        debugPort: 3205
+    },
     db : {
         mongo : {
             original : {