diff --git a/docker-compose-override-README.txt b/docker-compose-override-README.txt
new file mode 100644
index 0000000..e165c6d
--- /dev/null
+++ b/docker-compose-override-README.txt
@@ -0,0 +1,76 @@
+# on dev/local machine, copy this file as "docker-compose.override.yml"
+
+version: "3.4"
+
+services:
+  frontend:
+    image: node:lts    
+    volumes:
+      - ./FrontEnd:/frontend
+      - /frontend/node_modules
+    env_file:
+      .env
+    container_name: "frontend"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=frontend"
+      - "traefik.port=3000"
+      - "traefik.frontend.rule=PathPrefix: /"
+      - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
+    command: /bin/sh -c "cd frontend; yarn; yarn install; yarn start"
+  
+  pythonrpcserver:    
+    volumes:
+      - "${DATA:-~/docker_data}/data:/data"
+  
+  db:
+    ports:
+      - "5432:5432"
+
+  pgadmin:
+    image: dpage/pgadmin4:4.11
+    depends_on:
+      - db
+      - traefik
+    volumes:
+      - "${DATA:-~/docker_data}/pga4volume:/var/lib/pgadmin"
+    env_file:
+      - ".env"
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${ADMIN_USER_ID:-guest}
+      - PGADMIN_DEFAULT_PASSWORD=${ADMIN_PASSWORD:-guest}
+    container_name: "pgadmin"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=pgadmin"
+      - "traefik.port=80"
+      - "traefik.frontend.rule=PathPrefix:/pgadmin"
+      - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
+
+  elasticsearch:
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+
+  kibana:
+    container_name: kibana
+    image: docker.elastic.co/kibana/kibana:7.6.2
+    ports:
+      - 5601:5601
+    depends_on:
+      - elasticsearch
+    environment:
+      - ELASTICSEARCH_URL=http://localhost:9200
+    # environment:
+    #   - SERVER_BASEPATH=/kibana/
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=frontend"
+      - "traefik.port=5601"
+      - "traefik.frontend.rule=PathPrefix: /kibana/"
+      - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
+
+  rabbitmq:
+    ports:
+      - "5672:5672"
+  
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 6965862..416f040 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -71,8 +71,8 @@ services:
     image: postgres:11.7
     volumes:
       - "${DATA:-~/docker_data}/pgvolume:/var/lib/postgresql/data"
-    ports:
-      - "5432:5432"
+    #ports:
+    #  - "5432:5432"
     env_file:
       - ".env"
     environment:
@@ -80,26 +80,6 @@ services:
       - POSTGRES_PASSWORD=${ADMIN_PASSWORD:-guest}
     container_name: "db"
 
-  pgadmin:
-    image: dpage/pgadmin4:4.11
-    depends_on:
-      - db
-      - traefik
-    volumes:
-      - "${DATA:-~/docker_data}/pga4volume:/var/lib/pgadmin"
-    env_file:
-      - ".env"
-    environment:
-      - PGADMIN_DEFAULT_EMAIL=${ADMIN_USER_ID:-guest}
-      - PGADMIN_DEFAULT_PASSWORD=${ADMIN_PASSWORD:-guest}
-    container_name: "pgadmin"
-    labels:
-      - "traefik.enable=true"
-      - "traefik.backend=pgadmin"
-      - "traefik.port=80"
-      - "traefik.frontend.rule=PathPrefix:/pgadmin"
-      - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
-
   rabbitmq:
     image: rabbitmq:management
     container_name: "rabbitmq"
@@ -180,4 +160,15 @@ services:
       - "traefik.port=80"
       - "traefik.frontend.rule=PathPrefix: /"
       - "traefik.website.frontend.whiteList.sourceRange=${TRAEFIK_IPFILTER:-172.16.0.0/12}"
-    container_name: "frontend"
\ No newline at end of file
+    container_name: "frontend"
+
+  elasticsearch:
+    container_name: elasticsearch
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.6.2
+    volumes:
+      - "${DATA:-~/docker_data}/elasticsearch:/usr/share/elasticsearch/data"
+    environment:
+      - xpack.monitoring.enabled=true
+      - xpack.watcher.enabled=false
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - discovery.type=single-node