diff --git a/app/routes/lab-mashup.js b/app/routes/lab-mashup.js
index d581a0e..f90973f 100644
--- a/app/routes/lab-mashup.js
+++ b/app/routes/lab-mashup.js
@@ -8,6 +8,16 @@ export default Ember.Route.extend({
         id: 'S1_ElectricalGrid',
         isPattern: false,
         type: ''
+      },
+      {
+        id: 'S2_ElectricalGrid',
+        isPattern: false,
+        type: ''
+      },
+      {
+        id: 'S3_ElectricalGrid',
+        isPattern: false,
+        type: ''
       }
     ]});
     //return this.store.findAll('entity');
@@ -27,6 +37,16 @@ export default Ember.Route.extend({
         id: 'S1_ElectricalGrid',
         isPattern: false,
         type: ''
+      },
+      {
+        id: 'S2_ElectricalGrid',
+        isPattern: false,
+        type: ''
+      },
+      {
+        id: 'S3_ElectricalGrid',
+        isPattern: false,
+        type: ''
       }
     ]});
     //this.store.findAll('entity');
diff --git a/config/environment.js b/config/environment.js
index 22ab654..7e09c2c 100644
--- a/config/environment.js
+++ b/config/environment.js
@@ -4,7 +4,7 @@ module.exports = function(environment) {
   /*********************************
    * This variable must be set to the address the server should be available on.
    */
-  var hostAddress = 'localhost';
+   var hostAddress = process.env.HOST_ADDRESS || 'localhost';
   /*
    *
    *********************************/
@@ -47,8 +47,6 @@ module.exports = function(environment) {
     // ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
     // ENV.APP.LOG_VIEW_LOOKUPS = true;
 
-    hostAddress = '192.168.99.100'; // docker-machine ip address (only when using docker on a mac)
-
     ENV.contentSecurityPolicy['script-src'] += " " + hostAddress + ":80";
     ENV.contentSecurityPolicy['connect-src'] += " ws://" + hostAddress + ":49152";
   }
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
index d2fd6ee..16248b0 100644
--- a/docker-compose-dev.yml
+++ b/docker-compose-dev.yml
@@ -21,4 +21,4 @@ playback:
   image: acs/playback
   links:
     - orion
-  command: orion:1026 m1_S1_ElectricalGrid_data.txt
+  command: orion:1026 m1_S1_ElectricalGrid_data.txt 200 3
diff --git a/docker-compose.yml b/docker-compose.yml
index d8d6205..2bd7c8f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,8 @@ nginx:
     - "80:80"
 
 ember:
+  environment:
+    HOST_ADDRESS: 'localhost'
   image: danlynn/ember-cli
   volumes:
     - ./:/myapp/
@@ -29,4 +31,4 @@ playback:
   image: acs/playback
   links:
     - orion
-  command: orion:1026 m1_S1_ElectricalGrid_data.txt
+  command: orion:1026 m1_S1_ElectricalGrid_data.txt 200 3