diff --git a/docker-compose.yml b/docker-compose.yml
index 8565610..8b3c42a 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,26 +1,25 @@
-version: "3"
+version: '3'
 services:
   app:
     container_name: app
     depends_on:
       - mongo
     restart: always
-    build: .
+    build: ./node
     image: custom/node
     ports:
-      - "3001:3001"
+      - '3001:3001'
     links:
       - mongo
   mongo:
     container_name: mongo
-    image: mongo
+    build: ./mongo
+    image: custom/mongo
     environment:
-      # provide your credentials here
-      - MONGO_INITDB_ROOT_USERNAME=root
-      - MONGO_INITDB_ROOT_PASSWORD=ruth
-    command: mongod
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: ruth
     ports:
-      - "27017:27017"
+      - 27017:27017
   prometheus:
     container_name: prometheus
     image: prom/prometheus:latest
@@ -33,7 +32,6 @@ services:
     image: grafana/grafana
     ports:
       - 3000:3000
-# configuration below to set subnet in order to function within BB network.
 networks:
   default:
     ipam:
diff --git a/mongo/Dockerfile b/mongo/Dockerfile
new file mode 100644
index 0000000..70052b0
--- /dev/null
+++ b/mongo/Dockerfile
@@ -0,0 +1,5 @@
+FROM mongo
+
+COPY dbusersetup.js /docker-entrypoint-initdb.d
+
+EXPOSE 27017
\ No newline at end of file
diff --git a/mongo/dbusersetup.js b/mongo/dbusersetup.js
new file mode 100644
index 0000000..e25017b
--- /dev/null
+++ b/mongo/dbusersetup.js
@@ -0,0 +1,10 @@
+// create test user
+use test
+db.createUser(
+  {
+    user: "myTester",
+    pwd: "test",
+    roles: [ { role: "readWrite", db: "test" },
+             { role: "read", db: "reporting" } ]
+  }
+)
diff --git a/Dockerfile b/node/Dockerfile
similarity index 100%
rename from Dockerfile
rename to node/Dockerfile
diff --git a/app.js b/node/app.js
similarity index 99%
rename from app.js
rename to node/app.js
index aec079c..e2b316b 100755
--- a/app.js
+++ b/node/app.js
@@ -13,13 +13,12 @@ const libCounter = new Prometheus.Counter({
 });
 
 const libUptime = new Prometheus.Counter({
-  name:  'lib_upTime',
+  name: 'lib_upTime',
   help: 'uptime A counter of the application\'s uptime in seconds.'
 })
 
 
 // const collectDefaultMetrics = Prometheus.collectDefaultMetrics;
-
 // Probe every 5th second.
 // collectDefaultMetrics({ timeout: 5000 });
 
diff --git a/package.json b/node/package.json
similarity index 100%
rename from package.json
rename to node/package.json
diff --git a/org_cheat_sheet b/org_cheat_sheet
index aeeb3fe..04cb478 100644
--- a/org_cheat_sheet
+++ b/org_cheat_sheet
@@ -69,3 +69,10 @@ db.createUser(
 exit
 // logging in as new user
 mongo -u "myTester" -p "test" --authenticationDatabase "test"
+
+// git :: reset local with remote
+git fetch
+git reset --hard origin/master
+
+// mongodb env vars don't get setup if container is already running
+// https://github.com/docker-library/mongo/issues/174#issuecomment-297538188