diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9652408..4c1f818 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,24 +2,29 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="f410c5c2-3ffe-4260-93eb-e3d83256d263" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/camera.py" beforeDir="false" afterPath="$PROJECT_DIR$/camera.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/image_tools.py" beforeDir="false" afterPath="$PROJECT_DIR$/image_tools.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/index.py" beforeDir="false" afterPath="$PROJECT_DIR$/index.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test-images/lot-1-car.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test-images/lot-1-car.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test-images/lot-2-cars.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test-images/lot-2-cars.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test-images/lot-3-cars.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test-images/lot-3-cars.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test-images/lot-4-cars.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test-images/lot-4-cars.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test-images/lot-5-cars-A.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test-images/lot-5-cars-A.jpg" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/test-images/lot-5-cars-B.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/lib/test-images/lot-5-cars-B.jpg" afterDir="false" />
     </list>
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/index.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="225">
-              <caret line="24" column="5" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
+            <state relative-caret-position="161">
+              <caret line="30" column="54" selection-start-line="30" selection-start-column="54" selection-end-line="30" selection-end-column="54" />
               <folding>
                 <element signature="e#0#21#0" expanded="true" />
               </folding>
@@ -61,8 +66,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/image_tools.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="270">
-              <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
+            <state relative-caret-position="45">
+              <caret line="3" column="23" lean-forward="true" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -79,8 +84,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/.env">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="16" selection-start-column="16" selection-end-column="16" />
+            <state relative-caret-position="45">
+              <caret line="3" column="15" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
             </state>
           </provider>
         </entry>
@@ -89,7 +94,7 @@
         <entry file="file://$PROJECT_DIR$/config.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="75">
-              <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+              <caret line="5" selection-start-line="5" selection-end-line="5" />
             </state>
           </provider>
         </entry>
@@ -110,12 +115,12 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/image_diff_color.py" />
-        <option value="$PROJECT_DIR$/image_tools.py" />
         <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/config.py" />
         <option value="$PROJECT_DIR$/example.env" />
-        <option value="$PROJECT_DIR$/.env" />
         <option value="$PROJECT_DIR$/camera.py" />
+        <option value="$PROJECT_DIR$/.env" />
+        <option value="$PROJECT_DIR$/image_tools.py" />
         <option value="$PROJECT_DIR$/index.py" />
       </list>
     </option>
@@ -177,7 +182,7 @@
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="57f4d31d-2726-4888-8d46-d2583bdc9c3d" name="Default Changelist" comment="" />
+      <changelist id="f410c5c2-3ffe-4260-93eb-e3d83256d263" name="Default Changelist" comment="" />
       <created>1549681542752</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
@@ -189,7 +194,7 @@
     <frame x="0" y="27" width="1920" height="1053" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18133895" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18133895" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -200,7 +205,7 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Version Control" order="7" />
-      <window_info anchor="bottom" id="Terminal" order="8" visible="true" weight="0.32972974" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.32972974" />
       <window_info anchor="bottom" id="Python Console" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -214,9 +219,7 @@
     <entry file="file://$PROJECT_DIR$/lib/test-images/lot-empty.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/test.jpg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
+    <entry file="file://$PROJECT_DIR$/test.jpg" />
     <entry file="file://$PROJECT_DIR$/capture.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -226,9 +229,6 @@
     <entry file="file://$PROJECT_DIR$/lib/test-images/lot-5-cars-B.jpg">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/test-images/lot-3-cars.jpg">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="45">
@@ -236,26 +236,25 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config.py">
+    <entry file="file://$PROJECT_DIR$/example.env">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
+        <state relative-caret-position="30">
+          <caret line="2" column="13" selection-start-line="2" selection-end-line="2" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.env">
+    <entry file="file://$PROJECT_DIR$/config.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="16" selection-start-column="16" selection-end-column="16" />
+        <state relative-caret-position="75">
+          <caret line="5" selection-start-line="5" selection-end-line="5" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/image_tools.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="18" column="35" lean-forward="true" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/ref-img.jpg">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/test-images/lot-3-cars.jpg">
+      <provider selected="true" editor-type-id="images" />
     </entry>
     <entry file="file://$PROJECT_DIR$/camera.py">
       <provider selected="true" editor-type-id="text-editor">
@@ -267,17 +266,24 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/example.env">
+    <entry file="file://$PROJECT_DIR$/.env">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="13" selection-start-line="2" selection-end-line="2" selection-end-column="13" />
+        <state relative-caret-position="45">
+          <caret line="3" column="15" selection-start-line="3" selection-start-column="15" selection-end-line="3" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/image_tools.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="45">
+          <caret line="3" column="23" lean-forward="true" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/index.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="24" column="5" selection-start-line="24" selection-start-column="5" selection-end-line="24" selection-end-column="5" />
+        <state relative-caret-position="161">
+          <caret line="30" column="54" selection-start-line="30" selection-start-column="54" selection-end-line="30" selection-end-column="54" />
           <folding>
             <element signature="e#0#21#0" expanded="true" />
           </folding>
diff --git a/image_tools.py b/image_tools.py
index d0954de..4c7f236 100644
--- a/image_tools.py
+++ b/image_tools.py
@@ -1,8 +1,9 @@
-def average_color(x, y, n, image):
+def average_color(x, y, w, h, image):
     r, g, b = 0, 0, 0
     count = 0
-    for s in range(x, x + n + 1):
-        for t in range(y, y + n + 1):
+    print([x, y, w, h])
+    for s in range(x, x + w + 1):
+        for t in range(y, y + h + 1):
             pixlr, pixlg, pixlb = image[s, t]
             r += pixlr
             g += pixlg
diff --git a/index.py b/index.py
index 2a196ad..10bd5ca 100644
--- a/index.py
+++ b/index.py
@@ -2,7 +2,9 @@ import firebase_admin
 from firebase_admin import credentials
 from firebase_admin import firestore
 from PIL import Image
-import time, os
+import time
+import os
+import urllib.request
 
 import camera
 import image_tools
@@ -16,25 +18,29 @@ firebase_admin.initialize_app(cred)
 
 db = firestore.client()
 
-doc_ref_lot1 = db.collection(os.getenv('LOT_NAME'))
+def poll():
+    doc_ref_lot = db.collection('lots').document(os.getenv('LOT_NAME'))
 
+    # Get the reference image
+    lot_info = doc_ref_lot.collection('info').document('lotInfo').get().to_dict()
+    urllib.request.urlretrieve('http://localhost:8000/img/references/'+lot_info['refImage'], './ref-img.jpg')
+    reference = Image.open('./ref-img.jpg').load()
 
-def poll():
     # Take the picture
-    img = Image.open(camera.capture(os.getenv('CAMERA_DEVICE'))).load()
-    #img = Image.open('./lib/test-images/lot-empty.jpg').load()
-    reference = Image.open(os.getenv('REFERENCE_IMAGE')).load()
+    #img = Image.open(camera.capture(os.getenv('CAMERA_DEVICE'))).load()
+    img = Image.open('./lib/test-images-vert/lot-1-car.jpg').load()
 
-    stalls = doc_ref_lot1.get()
+    doc_ref_stalls = doc_ref_lot.collection('stalls').get()
 
-    for stall in stalls:
+    for stall in doc_ref_stalls:
         stall_obj = stall.to_dict()
-        color_reference = image_tools.average_color(stall_obj['locationX'], stall_obj['locationY'], stall_obj['sideN'], reference)
-        color_compare = image_tools.average_color(stall_obj['locationX'], stall_obj['locationY'], stall_obj['sideN'], img)
+        color_reference = image_tools.average_color(stall_obj['locationX'], stall_obj['locationY'], stall_obj['width'], stall_obj['height'], reference)
+        color_compare = image_tools.average_color(stall_obj['locationX'], stall_obj['locationY'], stall_obj['width'], stall_obj['height'], img)
         stall_occupied = image_tools.threshold(image_tools.differences(color_reference, color_compare), float(os.getenv('E_HAT_TRIGGER_LEVEL')))
         stall_obj['open'] = not stall_occupied
-        print(stall.id)
-        db.collection(u'Lot1').document(stall.id).set( stall_obj )
+        print("Updated: "+stall.id)
+
+        doc_ref_lot.collection('stalls').document(stall.id).set(stall_obj)
 
 
 start_time = time.time()
diff --git a/lib/test-images/lot-1-car.jpg b/lib/test-images/lot-1-car.jpg
index a2f9ecb..2a523f7 100644
Binary files a/lib/test-images/lot-1-car.jpg and b/lib/test-images/lot-1-car.jpg differ
diff --git a/lib/test-images/lot-2-cars.jpg b/lib/test-images/lot-2-cars.jpg
index 34d0422..93fb01d 100644
Binary files a/lib/test-images/lot-2-cars.jpg and b/lib/test-images/lot-2-cars.jpg differ
diff --git a/lib/test-images/lot-3-cars.jpg b/lib/test-images/lot-3-cars.jpg
index 7a48093..afc0a8e 100644
Binary files a/lib/test-images/lot-3-cars.jpg and b/lib/test-images/lot-3-cars.jpg differ
diff --git a/lib/test-images/lot-4-cars.jpg b/lib/test-images/lot-4-cars.jpg
index 506494c..d78a5dd 100644
Binary files a/lib/test-images/lot-4-cars.jpg and b/lib/test-images/lot-4-cars.jpg differ
diff --git a/lib/test-images/lot-5-cars-A.jpg b/lib/test-images/lot-5-cars-A.jpg
index a0b1408..7903205 100644
Binary files a/lib/test-images/lot-5-cars-A.jpg and b/lib/test-images/lot-5-cars-A.jpg differ
diff --git a/lib/test-images/lot-5-cars-B.jpg b/lib/test-images/lot-5-cars-B.jpg
index 9ef259b..1a26368 100644
Binary files a/lib/test-images/lot-5-cars-B.jpg and b/lib/test-images/lot-5-cars-B.jpg differ
diff --git a/ref-img.jpg b/ref-img.jpg
new file mode 100644
index 0000000..9a7d815
Binary files /dev/null and b/ref-img.jpg differ