@@ -6,6 +6,7 @@ var Data = {
 	scans: [],
 
 	config: {
+		data_client: 'http://127.0.0.1:44444/',
 		domain: 'https://standing-fleet.herokuapp.com/',
 		apiUrl: '/api',
 		alertStay: 5000,
@@ -29,6 +30,7 @@ var Data = {
 			systemId: ''
 		},
 		alertCount: 0,
+		data_client: null,
 		dimmed: false,
 		lastPollTs : Date.now(),
 		memberSortOrder: {
 
@@ -2,11 +2,14 @@ $(function () {
 	UI.registerEventHandlers();
 	initialize();
 
-	data_client = new Faye.Client('http://127.0.0.1:44444/');
-  data_client.subscribe('/events', function(event) {
-		console.log(event)
-		EventList.addEvent(event);
-  });
+	try {
+		Data.state.data_client = new Faye.Client(Data.config.data_client);
+		Data.state.data_client.subscribe('/events', function(event) {
+			EventList.addEvent(event);
+		});
+	} catch(err) {
+		console.log('Unable to connect to local data client...')
+	}
 
 });
 
 
@@ -5,13 +5,17 @@ var Data = {
     alertStay: 5000,
     maxEvents: 20,
     uiSpeed: 400,
+    local_dataport: 44444,
     log: 'console'
   },
 
   state: {
     alertCount: 0,
     dimmed: false,
-    pollLoop: 0
+    pollLoop: 0,
+    datasources: {
+      local: null
+    }
   },
 
   build_ui: function() {
 
@@ -19,22 +19,22 @@ function initializeClient() {
   Data.templates = Data.build_templates();
 
   log('Starting Server...')
-  var server = http.createServer(),
-      bayeux = new faye.NodeAdapter({mount: '/', timeout: 45});
+  var server = http.createServer()
+  Data.state.datasources.local = new faye.NodeAdapter({mount: '/', timeout: 45});
 
-  bayeux.attach(server);
-  server.listen(44444);
+  Data.state.datasources.local.attach(server);
+  server.listen(Data.config.local_dataport);
 
   UI.stopSpin();
   UI.registerEventHandlers();
 
   log('Begin Polling...')
 
-  pollClipboard(bayeux);
+  pollClipboard();
   gui.Window.get().show();
 };
 
-function pollClipboard(bayeux) {
+function pollClipboard() {
   UI.startSpin();
   setTimeout(function() {
     var cb = gui.Clipboard.get();
@@ -43,11 +43,11 @@ function pollClipboard(bayeux) {
 
     var renderedEvent = $(Templates.event(event))
     Data.ui.clipboard_list.prepend(renderedEvent);
-    bayeux.getClient().publish('/events', event);
+    Data.state.datasources.local.getClient().publish('/events', event);
 
     UI.stopSpin();
 
-    pollClipboard(bayeux);
+    pollClipboard();
   }, 7000);
 }