@@ -1,6 +1,7 @@
 # HTTP Server host
 import threading
 from flask import Flask, abort
+from flask_cors import CORS
 # Data Retrieval
 import redis
 import json, sys, sqlite3
@@ -45,6 +46,7 @@
 
 # Flask app settings
 app = Flask(__name__)
+CORS(app)
 
 # Host redis process location, contains data to collect
 # Use the Raspberry Pi IP, should be static
@@ -179,17 +181,23 @@ def WriteEventData(newFolderName):
             event_writer.writerow(event_data_row)
         print('EVENT DATA SAVED')
 
+STORAGE_STATUS = False
+
 @app.route('/serial/storage/<action>')
 def ReplicationControl(action):
+    global STORAGE_STATUS
+
     if action == 'START':
         print('REDIS REPLICATION START')
         Replicate()
+        STORAGE_STATUS = True
         # Stop the storage loop
         return('REDIS REPLICATION STARTED')
 
     if action == 'CLOSE':
         print('REDIS REPLICATION STOP')
         StopReplicate()
+        STORAGE_STATUS = False
         # Start the infinite loop of pulling and storing data
         return('REDIS REPLICATION STOPPED')
 
@@ -198,6 +206,10 @@ def ReplicationControl(action):
         fileName = Write()
         return('REDIS PERSISTED TO ' + fileName)
 
+    if action == 'STATUS':
+        print('STATUS UPDATE REQUESTED')
+        return str(STORAGE_STATUS)
+
     return(404)
 
 if __name__ == "__main__":
 
@@ -5,4 +5,5 @@ Jinja2==2.11.3
 MarkupSafe==1.1.1
 pyserial==3.5
 redis==4.2.1
-Werkzeug==1.0.1
+Werkzeug==1.0.1
+flask-cors
@@ -45,9 +45,12 @@ async def producer_handler(websocket, path):
     while True:
         # Package sensor and valve data
         # print("Looping...")
+        # Debug limiter on loop speed:
+        # await asyncio.sleep(.1)
         try:
             # From the sensor producer
             sensor_message = await sensor_producer(Loop_starter)
+            # print(sensor_message)
             # And the valve producer
             # valve_message = await valve_producer(Loop_starter)
             # After the initial loop, change the condition
@@ -72,8 +75,9 @@ async def producer_handler(websocket, path):
                 await websocket.ping()
             else:
                 # Send the messages
+                # print(sensor_message)
                 await websocket.send(json.dumps({'message': sensor_message}))
-                # Don't overload the websocket
+                # Don't overload the websocket (race condition?)
                 await asyncio.sleep(.1)
                 # Confirm reception of the data frame
                 response = await websocket.recv()
@@ -127,6 +131,7 @@ async def sensor_producer(Loop_starter):
 
     try: 
         if Loop_starter == 0:
+            print("initial loop")
             # Grab the first item to establish the range for XREAD
             sensor_data = redis.xrange(sensor_stream_name, count=1)
             (sensor_label,sensor_data) = sensor_data[0]
@@ -140,10 +145,11 @@ async def sensor_producer(Loop_starter):
             sensor_data = redis.xread({ sensor_stream_name: f'{sensor_label.decode()}'}, block=1)
             (sensor_label,sensor_data) = sensor_data[0]
     except IndexError:
+        # There is no new data to push
         # print("INDEX ERROR")
         return []
     except NameError:
-        # print("Didn't initally loop")
+        print("Didn't initally loop")
         return []
     except ws.exceptions.ConnectionClosed:
         print("Connection Closed")
 
@@ -26,6 +26,6 @@ services:
 
   redis:
     container_name: redis-db
-    image: redis
+    image: redis:7.0.5
     ports:
       - 6379:6379