diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f05e7fd..264d9da 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,12 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -110,12 +115,7 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="975">
               <caret line="69" column="5" lean-forward="false" selection-start-line="50" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
-              <folding>
-                <element signature="e#754#755#0" expanded="false" />
-                <element signature="e#803#804#0" expanded="false" />
-                <element signature="e#833#834#0" expanded="false" />
-                <element signature="e#881#882#0" expanded="false" />
-              </folding>
+              <folding />
             </state>
           </provider>
         </entry>
@@ -123,8 +123,8 @@
       <file leaf-file-name="POC.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1245">
-              <caret line="83" column="31" lean-forward="false" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+            <state relative-caret-position="555">
+              <caret line="37" column="66" lean-forward="false" selection-start-line="37" selection-start-column="66" selection-end-line="37" selection-end-column="66" />
               <folding />
             </state>
           </provider>
@@ -133,121 +133,14 @@
       <file leaf-file-name="Well.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="16380">
-              <caret line="1223" column="30" lean-forward="false" selection-start-line="1223" selection-start-column="30" selection-end-line="1223" selection-end-column="30" />
+            <state relative-caret-position="7965">
+              <caret line="660" column="0" lean-forward="false" selection-start-line="660" selection-start-column="0" selection-end-line="660" selection-end-column="0" />
               <folding>
-                <element signature="e#8950#8951#0" expanded="false" />
-                <element signature="e#8975#8976#0" expanded="false" />
-                <element signature="e#9011#9012#0" expanded="false" />
-                <element signature="e#9039#9040#0" expanded="false" />
-                <element signature="e#9084#9085#0" expanded="false" />
-                <element signature="e#9125#9126#0" expanded="false" />
-                <element signature="e#9193#9194#0" expanded="false" />
-                <element signature="e#9253#9254#0" expanded="false" />
-                <element signature="e#9293#9294#0" expanded="false" />
-                <element signature="e#9329#9330#0" expanded="false" />
-                <element signature="e#9387#9388#0" expanded="false" />
-                <element signature="e#9437#9438#0" expanded="false" />
-                <element signature="e#9474#9475#0" expanded="false" />
-                <element signature="e#9507#9508#0" expanded="false" />
-                <element signature="e#9559#9560#0" expanded="false" />
-                <element signature="e#9603#9604#0" expanded="false" />
-                <element signature="e#9636#9637#0" expanded="false" />
-                <element signature="e#9668#9669#0" expanded="false" />
-                <element signature="e#9715#9716#0" expanded="false" />
-                <element signature="e#9757#9758#0" expanded="false" />
-                <element signature="e#9801#9802#0" expanded="false" />
-                <element signature="e#9841#9842#0" expanded="false" />
-                <element signature="e#9907#9908#0" expanded="false" />
-                <element signature="e#9965#9966#0" expanded="false" />
-                <element signature="e#10004#10005#0" expanded="false" />
-                <element signature="e#10039#10040#0" expanded="false" />
-                <element signature="e#10235#10236#0" expanded="false" />
-                <element signature="e#10266#10267#0" expanded="false" />
-                <element signature="e#10493#10494#0" expanded="false" />
-                <element signature="e#10524#10525#0" expanded="false" />
-                <element signature="e#10765#10766#0" expanded="false" />
-                <element signature="e#10794#10795#0" expanded="false" />
-                <element signature="e#10910#10911#0" expanded="false" />
-                <element signature="e#10955#10956#0" expanded="false" />
-                <element signature="e#11079#11080#0" expanded="false" />
-                <element signature="e#11128#11129#0" expanded="false" />
-                <element signature="e#11720#11721#0" expanded="false" />
-                <element signature="e#11759#11760#0" expanded="false" />
-                <element signature="e#11823#11824#0" expanded="false" />
-                <element signature="e#11879#11880#0" expanded="false" />
-                <element signature="e#11919#11920#0" expanded="false" />
-                <element signature="e#11955#11956#0" expanded="false" />
-                <element signature="e#11990#11991#0" expanded="false" />
-                <element signature="e#12021#12022#0" expanded="false" />
-                <element signature="e#12072#12073#0" expanded="false" />
-                <element signature="e#12119#12120#0" expanded="false" />
-                <element signature="e#12162#12163#0" expanded="false" />
-                <element signature="e#12201#12202#0" expanded="false" />
-                <element signature="e#12265#12266#0" expanded="false" />
-                <element signature="e#12321#12322#0" expanded="false" />
-                <element signature="e#12369#12370#0" expanded="false" />
-                <element signature="e#12409#12410#0" expanded="false" />
-                <element signature="e#12444#12445#0" expanded="false" />
-                <element signature="e#12475#12476#0" expanded="false" />
-                <element signature="e#12514#12515#0" expanded="false" />
-                <element signature="e#12549#12550#0" expanded="false" />
-                <element signature="e#12582#12583#0" expanded="false" />
-                <element signature="e#12614#12615#0" expanded="false" />
-                <element signature="e#13216#13217#0" expanded="false" />
-                <element signature="e#13246#13247#0" expanded="false" />
-                <element signature="e#13621#13622#0" expanded="false" />
-                <element signature="e#13666#13667#0" expanded="false" />
-                <element signature="e#13711#13712#0" expanded="false" />
-                <element signature="e#13752#13753#0" expanded="false" />
-                <element signature="e#13802#13803#0" expanded="false" />
-                <element signature="e#13848#13849#0" expanded="false" />
-                <element signature="e#13894#13895#0" expanded="false" />
-                <element signature="e#13936#13937#0" expanded="false" />
-                <element signature="e#13975#13976#0" expanded="false" />
-                <element signature="e#14012#14013#0" expanded="false" />
-                <element signature="e#14070#14071#0" expanded="false" />
-                <element signature="e#14122#14123#0" expanded="false" />
-                <element signature="e#14164#14165#0" expanded="false" />
-                <element signature="e#14204#14205#0" expanded="false" />
-                <element signature="e#14241#14242#0" expanded="false" />
-                <element signature="e#14276#14277#0" expanded="false" />
-                <element signature="e#14316#14317#0" expanded="false" />
-                <element signature="e#14354#14355#0" expanded="false" />
-                <element signature="e#14387#14388#0" expanded="false" />
-                <element signature="e#14419#14420#0" expanded="false" />
-                <element signature="e#14477#14478#0" expanded="false" />
-                <element signature="e#14527#14528#0" expanded="false" />
-                <element signature="e#14589#14590#0" expanded="false" />
-                <element signature="e#14643#14644#0" expanded="false" />
-                <element signature="e#14701#14702#0" expanded="false" />
-                <element signature="e#14751#14752#0" expanded="false" />
-                <element signature="e#14791#14792#0" expanded="false" />
-                <element signature="e#14827#14828#0" expanded="false" />
-                <element signature="e#14869#14870#0" expanded="false" />
-                <element signature="e#14907#14908#0" expanded="false" />
-                <element signature="e#14947#14948#0" expanded="false" />
-                <element signature="e#14983#14984#0" expanded="false" />
-                <element signature="e#15017#15018#0" expanded="false" />
-                <element signature="e#15047#15048#0" expanded="false" />
-                <element signature="e#15093#15094#0" expanded="false" />
-                <element signature="e#15131#15132#0" expanded="false" />
-                <element signature="e#15172#15173#0" expanded="false" />
-                <element signature="e#15212#15213#0" expanded="false" />
-                <element signature="e#15259#15260#0" expanded="false" />
-                <element signature="e#15295#15296#0" expanded="false" />
-                <element signature="e#15339#15340#0" expanded="false" />
-                <element signature="e#15381#15382#0" expanded="false" />
-                <element signature="e#15434#15435#0" expanded="false" />
-                <element signature="e#15483#15484#0" expanded="false" />
-                <element signature="e#15681#15682#0" expanded="false" />
-                <element signature="e#15718#15719#0" expanded="false" />
-                <element signature="e#15775#15776#0" expanded="false" />
-                <element signature="e#15827#15828#0" expanded="false" />
-                <element signature="e#15874#15875#0" expanded="false" />
-                <element signature="e#15919#15920#0" expanded="false" />
-                <element signature="e#17811#17812#0" expanded="false" />
-                <element signature="e#17846#17847#0" expanded="false" />
+                <element signature="imports" expanded="true" />
+                <element signature="e#21388#21389#0" expanded="true" />
+                <element signature="e#21434#21435#0" expanded="true" />
+                <element signature="e#21628#21629#0" expanded="true" />
+                <element signature="e#21674#21675#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -258,15 +151,7 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="210">
               <caret line="17" column="33" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
-              <folding>
-                <element signature="imports" expanded="false" />
-                <element signature="e#1406#1407#0" expanded="false" />
-                <element signature="e#1442#1443#0" expanded="false" />
-                <element signature="e#1486#1487#0" expanded="false" />
-                <element signature="e#1518#1519#0" expanded="false" />
-                <element signature="e#1619#1620#0" expanded="false" />
-                <element signature="e#1656#1657#0" expanded="false" />
-              </folding>
+              <folding />
             </state>
           </provider>
         </entry>
@@ -281,11 +166,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="WebServer.java" pinned="false" current-in-tab="false">
+      <file leaf-file-name="WebServer.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="352">
-              <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
+            <state relative-caret-position="139">
+              <caret line="110" column="58" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="58" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -298,81 +183,7 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="675">
               <caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
-              <folding>
-                <element signature="imports" expanded="false" />
-                <element signature="e#2198#2199#0" expanded="false" />
-                <element signature="e#2248#2249#0" expanded="false" />
-                <element signature="e#2311#2312#0" expanded="false" />
-                <element signature="e#2362#2363#0" expanded="false" />
-                <element signature="e#2416#2417#0" expanded="false" />
-                <element signature="e#2458#2459#0" expanded="false" />
-                <element signature="e#2513#2514#0" expanded="false" />
-                <element signature="e#2556#2557#0" expanded="false" />
-                <element signature="e#2601#2602#0" expanded="false" />
-                <element signature="e#2644#2645#0" expanded="false" />
-                <element signature="e#2689#2690#0" expanded="false" />
-                <element signature="e#2733#2734#0" expanded="false" />
-                <element signature="e#2773#2774#0" expanded="false" />
-                <element signature="e#2812#2813#0" expanded="false" />
-                <element signature="e#2853#2854#0" expanded="false" />
-                <element signature="e#2893#2894#0" expanded="false" />
-                <element signature="e#2938#2939#0" expanded="false" />
-                <element signature="e#2984#2985#0" expanded="false" />
-                <element signature="e#3021#3022#0" expanded="false" />
-                <element signature="e#3056#3057#0" expanded="false" />
-                <element signature="e#3102#3103#0" expanded="false" />
-                <element signature="e#3144#3145#0" expanded="false" />
-                <element signature="e#3194#3195#0" expanded="false" />
-                <element signature="e#3240#3241#0" expanded="false" />
-                <element signature="e#3292#3293#0" expanded="false" />
-                <element signature="e#3340#3341#0" expanded="false" />
-                <element signature="e#3400#3401#0" expanded="false" />
-                <element signature="e#3456#3457#0" expanded="false" />
-                <element signature="e#3499#3500#0" expanded="false" />
-                <element signature="e#3538#3539#0" expanded="false" />
-                <element signature="e#3574#3575#0" expanded="false" />
-                <element signature="e#3606#3607#0" expanded="false" />
-                <element signature="e#3649#3650#0" expanded="false" />
-                <element signature="e#3688#3689#0" expanded="false" />
-                <element signature="e#3732#3733#0" expanded="false" />
-                <element signature="e#3772#3773#0" expanded="false" />
-                <element signature="e#3813#3814#0" expanded="false" />
-                <element signature="e#3850#3851#0" expanded="false" />
-                <element signature="e#3894#3895#0" expanded="false" />
-                <element signature="e#3934#3935#0" expanded="false" />
-                <element signature="e#3979#3980#0" expanded="false" />
-                <element signature="e#4020#4021#0" expanded="false" />
-                <element signature="e#4057#4058#0" expanded="false" />
-                <element signature="e#4090#4091#0" expanded="false" />
-                <element signature="e#4128#4129#0" expanded="false" />
-                <element signature="e#4162#4163#0" expanded="false" />
-                <element signature="e#4210#4211#0" expanded="false" />
-                <element signature="e#4254#4255#0" expanded="false" />
-                <element signature="e#4295#4296#0" expanded="false" />
-                <element signature="e#4332#4333#0" expanded="false" />
-                <element signature="e#4373#4374#0" expanded="false" />
-                <element signature="e#4410#4411#0" expanded="false" />
-                <element signature="e#4451#4452#0" expanded="false" />
-                <element signature="e#4488#4489#0" expanded="false" />
-                <element signature="e#4530#4531#0" expanded="false" />
-                <element signature="e#4568#4569#0" expanded="false" />
-                <element signature="e#4610#4611#0" expanded="false" />
-                <element signature="e#4648#4649#0" expanded="false" />
-                <element signature="e#4688#4689#0" expanded="false" />
-                <element signature="e#4724#4725#0" expanded="false" />
-                <element signature="e#4773#4774#0" expanded="false" />
-                <element signature="e#4817#4818#0" expanded="false" />
-                <element signature="e#4857#4858#0" expanded="false" />
-                <element signature="e#4893#4894#0" expanded="false" />
-                <element signature="e#4931#4932#0" expanded="false" />
-                <element signature="e#4965#4966#0" expanded="false" />
-                <element signature="e#5003#5004#0" expanded="false" />
-                <element signature="e#5037#5038#0" expanded="false" />
-                <element signature="e#5074#5075#0" expanded="false" />
-                <element signature="e#5110#5111#0" expanded="false" />
-                <element signature="e#5165#5166#0" expanded="false" />
-                <element signature="e#5215#5216#0" expanded="false" />
-              </folding>
+              <folding />
             </state>
           </provider>
         </entry>
@@ -382,38 +193,16 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="570">
               <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
-              <folding>
-                <element signature="imports" expanded="false" />
-                <element signature="e#1233#1234#0" expanded="false" />
-                <element signature="e#1265#1266#0" expanded="false" />
-                <element signature="e#1308#1309#0" expanded="false" />
-                <element signature="e#1340#1341#0" expanded="false" />
-                <element signature="e#1380#1381#0" expanded="false" />
-                <element signature="e#1416#1417#0" expanded="false" />
-                <element signature="e#1453#1454#0" expanded="false" />
-                <element signature="e#1486#1487#0" expanded="false" />
-                <element signature="e#1525#1526#0" expanded="false" />
-                <element signature="e#1560#1561#0" expanded="false" />
-                <element signature="e#1597#1598#0" expanded="false" />
-                <element signature="e#1630#1631#0" expanded="false" />
-                <element signature="e#1664#1665#0" expanded="false" />
-                <element signature="e#1694#1695#0" expanded="false" />
-                <element signature="e#1729#1730#0" expanded="false" />
-                <element signature="e#1760#1761#0" expanded="false" />
-                <element signature="e#1797#1798#0" expanded="false" />
-                <element signature="e#1830#1831#0" expanded="false" />
-                <element signature="e#1868#1869#0" expanded="false" />
-                <element signature="e#1902#1903#0" expanded="false" />
-              </folding>
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Database.java" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="559">
-              <caret line="302" column="19" lean-forward="true" selection-start-line="302" selection-start-column="19" selection-end-line="302" selection-end-column="19" />
+            <state relative-caret-position="4455">
+              <caret line="321" column="54" lean-forward="false" selection-start-line="321" selection-start-column="54" selection-end-line="321" selection-end-column="54" />
               <folding />
             </state>
           </provider>
@@ -450,6 +239,8 @@
       <find>arraycopy</find>
       <find>nT1</find>
       <find>index</find>
+      <find>fluidGasRatio</find>
+      <find>setupFluidRatio</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -863,10 +654,10 @@
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/CLScanner.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
       </list>
     </option>
   </component>
@@ -881,7 +672,8 @@
     <treeState />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="y" value="23" />
+    <option name="x" value="-1868" />
+    <option name="y" value="115" />
     <option name="width" value="1613" />
     <option name="height" value="913" />
   </component>
@@ -927,37 +719,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc-java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="POC-Java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="org.jetbrains.plugins.gradle.projectView.GradleTreeStructureProvider$GradleSourceSetDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="poc" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
         </subPane>
       </pane>
+      <pane id="Scope" />
       <pane id="Scratches" />
       <pane id="PackagesPane" />
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -965,7 +731,7 @@
     <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
+    <property name="settings.editor.selected.configurable" value="reference.settings.project.maven.repository.indices" />
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/patrickjmcd/Henry_Pump/POC-Java/src/main/java/com/henrypump/poc/Well.java" />
   </component>
   <component name="RunManager" selected="Application.POC">
@@ -1241,8 +1007,8 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1613" height="913" extended-state="0" />
-    <editor active="true" />
+    <frame x="-1868" y="115" width="1613" height="913" extended-state="0" />
+    <editor active="false" />
     <layout>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -1250,7 +1016,7 @@
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.11303345" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
+      <window_info id="Event Log" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.11205847" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32985258" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@@ -1258,7 +1024,7 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.154042" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15786123" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32967034" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24973376" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -1272,7 +1038,7 @@
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921347" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32960895" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886723" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -1324,29 +1090,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="675">
           <caret line="56" column="0" lean-forward="true" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#1233#1234#0" expanded="false" />
-            <element signature="e#1265#1266#0" expanded="false" />
-            <element signature="e#1308#1309#0" expanded="false" />
-            <element signature="e#1340#1341#0" expanded="false" />
-            <element signature="e#1380#1381#0" expanded="false" />
-            <element signature="e#1416#1417#0" expanded="false" />
-            <element signature="e#1453#1454#0" expanded="false" />
-            <element signature="e#1486#1487#0" expanded="false" />
-            <element signature="e#1525#1526#0" expanded="false" />
-            <element signature="e#1560#1561#0" expanded="false" />
-            <element signature="e#1597#1598#0" expanded="false" />
-            <element signature="e#1630#1631#0" expanded="false" />
-            <element signature="e#1664#1665#0" expanded="false" />
-            <element signature="e#1694#1695#0" expanded="false" />
-            <element signature="e#1729#1730#0" expanded="false" />
-            <element signature="e#1760#1761#0" expanded="false" />
-            <element signature="e#1797#1798#0" expanded="false" />
-            <element signature="e#1830#1831#0" expanded="false" />
-            <element signature="e#1868#1869#0" expanded="false" />
-            <element signature="e#1902#1903#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1362,25 +1106,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1395">
           <caret line="109" column="35" lean-forward="false" selection-start-line="109" selection-start-column="35" selection-end-line="109" selection-end-column="35" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2809#2810#0" expanded="false" />
-            <element signature="e#2844#2845#0" expanded="false" />
-            <element signature="e#2880#2881#0" expanded="false" />
-            <element signature="e#2912#2913#0" expanded="false" />
-            <element signature="e#2946#2947#0" expanded="false" />
-            <element signature="e#2976#2977#0" expanded="false" />
-            <element signature="e#3008#3009#0" expanded="false" />
-            <element signature="e#3036#3037#0" expanded="false" />
-            <element signature="e#3076#3077#0" expanded="false" />
-            <element signature="e#3114#3115#0" expanded="false" />
-            <element signature="e#3148#3149#0" expanded="false" />
-            <element signature="e#3178#3179#0" expanded="false" />
-            <element signature="e#3213#3214#0" expanded="false" />
-            <element signature="e#3244#3245#0" expanded="false" />
-            <element signature="e#3279#3280#0" expanded="false" />
-            <element signature="e#3310#3311#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1396,81 +1121,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2198#2199#0" expanded="false" />
-            <element signature="e#2248#2249#0" expanded="false" />
-            <element signature="e#2311#2312#0" expanded="false" />
-            <element signature="e#2362#2363#0" expanded="false" />
-            <element signature="e#2416#2417#0" expanded="false" />
-            <element signature="e#2458#2459#0" expanded="false" />
-            <element signature="e#2513#2514#0" expanded="false" />
-            <element signature="e#2556#2557#0" expanded="false" />
-            <element signature="e#2601#2602#0" expanded="false" />
-            <element signature="e#2644#2645#0" expanded="false" />
-            <element signature="e#2689#2690#0" expanded="false" />
-            <element signature="e#2733#2734#0" expanded="false" />
-            <element signature="e#2773#2774#0" expanded="false" />
-            <element signature="e#2812#2813#0" expanded="false" />
-            <element signature="e#2853#2854#0" expanded="false" />
-            <element signature="e#2893#2894#0" expanded="false" />
-            <element signature="e#2938#2939#0" expanded="false" />
-            <element signature="e#2984#2985#0" expanded="false" />
-            <element signature="e#3021#3022#0" expanded="false" />
-            <element signature="e#3056#3057#0" expanded="false" />
-            <element signature="e#3102#3103#0" expanded="false" />
-            <element signature="e#3144#3145#0" expanded="false" />
-            <element signature="e#3194#3195#0" expanded="false" />
-            <element signature="e#3240#3241#0" expanded="false" />
-            <element signature="e#3292#3293#0" expanded="false" />
-            <element signature="e#3340#3341#0" expanded="false" />
-            <element signature="e#3400#3401#0" expanded="false" />
-            <element signature="e#3456#3457#0" expanded="false" />
-            <element signature="e#3499#3500#0" expanded="false" />
-            <element signature="e#3538#3539#0" expanded="false" />
-            <element signature="e#3574#3575#0" expanded="false" />
-            <element signature="e#3606#3607#0" expanded="false" />
-            <element signature="e#3649#3650#0" expanded="false" />
-            <element signature="e#3688#3689#0" expanded="false" />
-            <element signature="e#3732#3733#0" expanded="false" />
-            <element signature="e#3772#3773#0" expanded="false" />
-            <element signature="e#3813#3814#0" expanded="false" />
-            <element signature="e#3850#3851#0" expanded="false" />
-            <element signature="e#3894#3895#0" expanded="false" />
-            <element signature="e#3934#3935#0" expanded="false" />
-            <element signature="e#3979#3980#0" expanded="false" />
-            <element signature="e#4020#4021#0" expanded="false" />
-            <element signature="e#4057#4058#0" expanded="false" />
-            <element signature="e#4090#4091#0" expanded="false" />
-            <element signature="e#4128#4129#0" expanded="false" />
-            <element signature="e#4162#4163#0" expanded="false" />
-            <element signature="e#4210#4211#0" expanded="false" />
-            <element signature="e#4254#4255#0" expanded="false" />
-            <element signature="e#4295#4296#0" expanded="false" />
-            <element signature="e#4332#4333#0" expanded="false" />
-            <element signature="e#4373#4374#0" expanded="false" />
-            <element signature="e#4410#4411#0" expanded="false" />
-            <element signature="e#4451#4452#0" expanded="false" />
-            <element signature="e#4488#4489#0" expanded="false" />
-            <element signature="e#4530#4531#0" expanded="false" />
-            <element signature="e#4568#4569#0" expanded="false" />
-            <element signature="e#4610#4611#0" expanded="false" />
-            <element signature="e#4648#4649#0" expanded="false" />
-            <element signature="e#4688#4689#0" expanded="false" />
-            <element signature="e#4724#4725#0" expanded="false" />
-            <element signature="e#4773#4774#0" expanded="false" />
-            <element signature="e#4817#4818#0" expanded="false" />
-            <element signature="e#4857#4858#0" expanded="false" />
-            <element signature="e#4893#4894#0" expanded="false" />
-            <element signature="e#4931#4932#0" expanded="false" />
-            <element signature="e#4965#4966#0" expanded="false" />
-            <element signature="e#5003#5004#0" expanded="false" />
-            <element signature="e#5037#5038#0" expanded="false" />
-            <element signature="e#5074#5075#0" expanded="false" />
-            <element signature="e#5110#5111#0" expanded="false" />
-            <element signature="e#5165#5166#0" expanded="false" />
-            <element signature="e#5215#5216#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1479,118 +1130,11 @@
         <state relative-caret-position="13125">
           <caret line="875" column="5" lean-forward="true" selection-start-line="875" selection-start-column="5" selection-end-line="875" selection-end-column="5" />
           <folding>
-            <element signature="e#8950#8951#0" expanded="false" />
-            <element signature="e#8975#8976#0" expanded="false" />
-            <element signature="e#9011#9012#0" expanded="false" />
-            <element signature="e#9039#9040#0" expanded="false" />
-            <element signature="e#9084#9085#0" expanded="false" />
-            <element signature="e#9125#9126#0" expanded="false" />
-            <element signature="e#9193#9194#0" expanded="false" />
-            <element signature="e#9253#9254#0" expanded="false" />
-            <element signature="e#9293#9294#0" expanded="false" />
-            <element signature="e#9329#9330#0" expanded="false" />
-            <element signature="e#9387#9388#0" expanded="false" />
-            <element signature="e#9437#9438#0" expanded="false" />
-            <element signature="e#9474#9475#0" expanded="false" />
-            <element signature="e#9507#9508#0" expanded="false" />
-            <element signature="e#9559#9560#0" expanded="false" />
-            <element signature="e#9603#9604#0" expanded="false" />
-            <element signature="e#9636#9637#0" expanded="false" />
-            <element signature="e#9668#9669#0" expanded="false" />
-            <element signature="e#9715#9716#0" expanded="false" />
-            <element signature="e#9757#9758#0" expanded="false" />
-            <element signature="e#9801#9802#0" expanded="false" />
-            <element signature="e#9841#9842#0" expanded="false" />
-            <element signature="e#9907#9908#0" expanded="false" />
-            <element signature="e#9965#9966#0" expanded="false" />
-            <element signature="e#10004#10005#0" expanded="false" />
-            <element signature="e#10039#10040#0" expanded="false" />
-            <element signature="e#10235#10236#0" expanded="false" />
-            <element signature="e#10266#10267#0" expanded="false" />
-            <element signature="e#10493#10494#0" expanded="false" />
-            <element signature="e#10524#10525#0" expanded="false" />
-            <element signature="e#10765#10766#0" expanded="false" />
-            <element signature="e#10794#10795#0" expanded="false" />
-            <element signature="e#10910#10911#0" expanded="false" />
-            <element signature="e#10955#10956#0" expanded="false" />
-            <element signature="e#11079#11080#0" expanded="false" />
-            <element signature="e#11128#11129#0" expanded="false" />
-            <element signature="e#11720#11721#0" expanded="false" />
-            <element signature="e#11759#11760#0" expanded="false" />
-            <element signature="e#11823#11824#0" expanded="false" />
-            <element signature="e#11879#11880#0" expanded="false" />
-            <element signature="e#11919#11920#0" expanded="false" />
-            <element signature="e#11955#11956#0" expanded="false" />
-            <element signature="e#11990#11991#0" expanded="false" />
-            <element signature="e#12021#12022#0" expanded="false" />
-            <element signature="e#12072#12073#0" expanded="false" />
-            <element signature="e#12119#12120#0" expanded="false" />
-            <element signature="e#12162#12163#0" expanded="false" />
-            <element signature="e#12201#12202#0" expanded="false" />
-            <element signature="e#12265#12266#0" expanded="false" />
-            <element signature="e#12321#12322#0" expanded="false" />
-            <element signature="e#12369#12370#0" expanded="false" />
-            <element signature="e#12409#12410#0" expanded="false" />
-            <element signature="e#12444#12445#0" expanded="false" />
-            <element signature="e#12475#12476#0" expanded="false" />
-            <element signature="e#12514#12515#0" expanded="false" />
-            <element signature="e#12549#12550#0" expanded="false" />
-            <element signature="e#12582#12583#0" expanded="false" />
-            <element signature="e#12614#12615#0" expanded="false" />
-            <element signature="e#13216#13217#0" expanded="false" />
-            <element signature="e#13246#13247#0" expanded="false" />
-            <element signature="e#13621#13622#0" expanded="false" />
-            <element signature="e#13666#13667#0" expanded="false" />
-            <element signature="e#13711#13712#0" expanded="false" />
-            <element signature="e#13752#13753#0" expanded="false" />
-            <element signature="e#13802#13803#0" expanded="false" />
-            <element signature="e#13848#13849#0" expanded="false" />
-            <element signature="e#13894#13895#0" expanded="false" />
-            <element signature="e#13936#13937#0" expanded="false" />
-            <element signature="e#13975#13976#0" expanded="false" />
-            <element signature="e#14012#14013#0" expanded="false" />
-            <element signature="e#14070#14071#0" expanded="false" />
-            <element signature="e#14122#14123#0" expanded="false" />
-            <element signature="e#14164#14165#0" expanded="false" />
-            <element signature="e#14204#14205#0" expanded="false" />
-            <element signature="e#14241#14242#0" expanded="false" />
-            <element signature="e#14276#14277#0" expanded="false" />
-            <element signature="e#14316#14317#0" expanded="false" />
-            <element signature="e#14354#14355#0" expanded="false" />
-            <element signature="e#14387#14388#0" expanded="false" />
-            <element signature="e#14419#14420#0" expanded="false" />
-            <element signature="e#14477#14478#0" expanded="false" />
-            <element signature="e#14527#14528#0" expanded="false" />
-            <element signature="e#14589#14590#0" expanded="false" />
-            <element signature="e#14643#14644#0" expanded="false" />
-            <element signature="e#14701#14702#0" expanded="false" />
-            <element signature="e#14751#14752#0" expanded="false" />
-            <element signature="e#14791#14792#0" expanded="false" />
-            <element signature="e#14827#14828#0" expanded="false" />
-            <element signature="e#14869#14870#0" expanded="false" />
-            <element signature="e#14907#14908#0" expanded="false" />
-            <element signature="e#14947#14948#0" expanded="false" />
-            <element signature="e#14983#14984#0" expanded="false" />
-            <element signature="e#15017#15018#0" expanded="false" />
-            <element signature="e#15047#15048#0" expanded="false" />
-            <element signature="e#15093#15094#0" expanded="false" />
-            <element signature="e#15131#15132#0" expanded="false" />
-            <element signature="e#15172#15173#0" expanded="false" />
-            <element signature="e#15212#15213#0" expanded="false" />
-            <element signature="e#15259#15260#0" expanded="false" />
-            <element signature="e#15295#15296#0" expanded="false" />
-            <element signature="e#15339#15340#0" expanded="false" />
-            <element signature="e#15381#15382#0" expanded="false" />
-            <element signature="e#15434#15435#0" expanded="false" />
-            <element signature="e#15483#15484#0" expanded="false" />
-            <element signature="e#15681#15682#0" expanded="false" />
-            <element signature="e#15718#15719#0" expanded="false" />
-            <element signature="e#15775#15776#0" expanded="false" />
-            <element signature="e#15827#15828#0" expanded="false" />
-            <element signature="e#15874#15875#0" expanded="false" />
-            <element signature="e#15919#15920#0" expanded="false" />
-            <element signature="e#17811#17812#0" expanded="false" />
-            <element signature="e#17846#17847#0" expanded="false" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#21388#21389#0" expanded="true" />
+            <element signature="e#21434#21435#0" expanded="true" />
+            <element signature="e#21628#21629#0" expanded="true" />
+            <element signature="e#21674#21675#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -1621,81 +1165,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2198#2199#0" expanded="false" />
-            <element signature="e#2248#2249#0" expanded="false" />
-            <element signature="e#2311#2312#0" expanded="false" />
-            <element signature="e#2362#2363#0" expanded="false" />
-            <element signature="e#2416#2417#0" expanded="false" />
-            <element signature="e#2458#2459#0" expanded="false" />
-            <element signature="e#2513#2514#0" expanded="false" />
-            <element signature="e#2556#2557#0" expanded="false" />
-            <element signature="e#2601#2602#0" expanded="false" />
-            <element signature="e#2644#2645#0" expanded="false" />
-            <element signature="e#2689#2690#0" expanded="false" />
-            <element signature="e#2733#2734#0" expanded="false" />
-            <element signature="e#2773#2774#0" expanded="false" />
-            <element signature="e#2812#2813#0" expanded="false" />
-            <element signature="e#2853#2854#0" expanded="false" />
-            <element signature="e#2893#2894#0" expanded="false" />
-            <element signature="e#2938#2939#0" expanded="false" />
-            <element signature="e#2984#2985#0" expanded="false" />
-            <element signature="e#3021#3022#0" expanded="false" />
-            <element signature="e#3056#3057#0" expanded="false" />
-            <element signature="e#3102#3103#0" expanded="false" />
-            <element signature="e#3144#3145#0" expanded="false" />
-            <element signature="e#3194#3195#0" expanded="false" />
-            <element signature="e#3240#3241#0" expanded="false" />
-            <element signature="e#3292#3293#0" expanded="false" />
-            <element signature="e#3340#3341#0" expanded="false" />
-            <element signature="e#3400#3401#0" expanded="false" />
-            <element signature="e#3456#3457#0" expanded="false" />
-            <element signature="e#3499#3500#0" expanded="false" />
-            <element signature="e#3538#3539#0" expanded="false" />
-            <element signature="e#3574#3575#0" expanded="false" />
-            <element signature="e#3606#3607#0" expanded="false" />
-            <element signature="e#3649#3650#0" expanded="false" />
-            <element signature="e#3688#3689#0" expanded="false" />
-            <element signature="e#3732#3733#0" expanded="false" />
-            <element signature="e#3772#3773#0" expanded="false" />
-            <element signature="e#3813#3814#0" expanded="false" />
-            <element signature="e#3850#3851#0" expanded="false" />
-            <element signature="e#3894#3895#0" expanded="false" />
-            <element signature="e#3934#3935#0" expanded="false" />
-            <element signature="e#3979#3980#0" expanded="false" />
-            <element signature="e#4020#4021#0" expanded="false" />
-            <element signature="e#4057#4058#0" expanded="false" />
-            <element signature="e#4090#4091#0" expanded="false" />
-            <element signature="e#4128#4129#0" expanded="false" />
-            <element signature="e#4162#4163#0" expanded="false" />
-            <element signature="e#4210#4211#0" expanded="false" />
-            <element signature="e#4254#4255#0" expanded="false" />
-            <element signature="e#4295#4296#0" expanded="false" />
-            <element signature="e#4332#4333#0" expanded="false" />
-            <element signature="e#4373#4374#0" expanded="false" />
-            <element signature="e#4410#4411#0" expanded="false" />
-            <element signature="e#4451#4452#0" expanded="false" />
-            <element signature="e#4488#4489#0" expanded="false" />
-            <element signature="e#4530#4531#0" expanded="false" />
-            <element signature="e#4568#4569#0" expanded="false" />
-            <element signature="e#4610#4611#0" expanded="false" />
-            <element signature="e#4648#4649#0" expanded="false" />
-            <element signature="e#4688#4689#0" expanded="false" />
-            <element signature="e#4724#4725#0" expanded="false" />
-            <element signature="e#4773#4774#0" expanded="false" />
-            <element signature="e#4817#4818#0" expanded="false" />
-            <element signature="e#4857#4858#0" expanded="false" />
-            <element signature="e#4893#4894#0" expanded="false" />
-            <element signature="e#4931#4932#0" expanded="false" />
-            <element signature="e#4965#4966#0" expanded="false" />
-            <element signature="e#5003#5004#0" expanded="false" />
-            <element signature="e#5037#5038#0" expanded="false" />
-            <element signature="e#5074#5075#0" expanded="false" />
-            <element signature="e#5110#5111#0" expanded="false" />
-            <element signature="e#5165#5166#0" expanded="false" />
-            <element signature="e#5215#5216#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1703,81 +1173,7 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2198#2199#0" expanded="false" />
-            <element signature="e#2248#2249#0" expanded="false" />
-            <element signature="e#2311#2312#0" expanded="false" />
-            <element signature="e#2362#2363#0" expanded="false" />
-            <element signature="e#2416#2417#0" expanded="false" />
-            <element signature="e#2458#2459#0" expanded="false" />
-            <element signature="e#2513#2514#0" expanded="false" />
-            <element signature="e#2556#2557#0" expanded="false" />
-            <element signature="e#2601#2602#0" expanded="false" />
-            <element signature="e#2644#2645#0" expanded="false" />
-            <element signature="e#2689#2690#0" expanded="false" />
-            <element signature="e#2733#2734#0" expanded="false" />
-            <element signature="e#2773#2774#0" expanded="false" />
-            <element signature="e#2812#2813#0" expanded="false" />
-            <element signature="e#2853#2854#0" expanded="false" />
-            <element signature="e#2893#2894#0" expanded="false" />
-            <element signature="e#2938#2939#0" expanded="false" />
-            <element signature="e#2984#2985#0" expanded="false" />
-            <element signature="e#3021#3022#0" expanded="false" />
-            <element signature="e#3056#3057#0" expanded="false" />
-            <element signature="e#3102#3103#0" expanded="false" />
-            <element signature="e#3144#3145#0" expanded="false" />
-            <element signature="e#3194#3195#0" expanded="false" />
-            <element signature="e#3240#3241#0" expanded="false" />
-            <element signature="e#3292#3293#0" expanded="false" />
-            <element signature="e#3340#3341#0" expanded="false" />
-            <element signature="e#3400#3401#0" expanded="false" />
-            <element signature="e#3456#3457#0" expanded="false" />
-            <element signature="e#3499#3500#0" expanded="false" />
-            <element signature="e#3538#3539#0" expanded="false" />
-            <element signature="e#3574#3575#0" expanded="false" />
-            <element signature="e#3606#3607#0" expanded="false" />
-            <element signature="e#3649#3650#0" expanded="false" />
-            <element signature="e#3688#3689#0" expanded="false" />
-            <element signature="e#3732#3733#0" expanded="false" />
-            <element signature="e#3772#3773#0" expanded="false" />
-            <element signature="e#3813#3814#0" expanded="false" />
-            <element signature="e#3850#3851#0" expanded="false" />
-            <element signature="e#3894#3895#0" expanded="false" />
-            <element signature="e#3934#3935#0" expanded="false" />
-            <element signature="e#3979#3980#0" expanded="false" />
-            <element signature="e#4020#4021#0" expanded="false" />
-            <element signature="e#4057#4058#0" expanded="false" />
-            <element signature="e#4090#4091#0" expanded="false" />
-            <element signature="e#4128#4129#0" expanded="false" />
-            <element signature="e#4162#4163#0" expanded="false" />
-            <element signature="e#4210#4211#0" expanded="false" />
-            <element signature="e#4254#4255#0" expanded="false" />
-            <element signature="e#4295#4296#0" expanded="false" />
-            <element signature="e#4332#4333#0" expanded="false" />
-            <element signature="e#4373#4374#0" expanded="false" />
-            <element signature="e#4410#4411#0" expanded="false" />
-            <element signature="e#4451#4452#0" expanded="false" />
-            <element signature="e#4488#4489#0" expanded="false" />
-            <element signature="e#4530#4531#0" expanded="false" />
-            <element signature="e#4568#4569#0" expanded="false" />
-            <element signature="e#4610#4611#0" expanded="false" />
-            <element signature="e#4648#4649#0" expanded="false" />
-            <element signature="e#4688#4689#0" expanded="false" />
-            <element signature="e#4724#4725#0" expanded="false" />
-            <element signature="e#4773#4774#0" expanded="false" />
-            <element signature="e#4817#4818#0" expanded="false" />
-            <element signature="e#4857#4858#0" expanded="false" />
-            <element signature="e#4893#4894#0" expanded="false" />
-            <element signature="e#4931#4932#0" expanded="false" />
-            <element signature="e#4965#4966#0" expanded="false" />
-            <element signature="e#5003#5004#0" expanded="false" />
-            <element signature="e#5037#5038#0" expanded="false" />
-            <element signature="e#5074#5075#0" expanded="false" />
-            <element signature="e#5110#5111#0" expanded="false" />
-            <element signature="e#5165#5166#0" expanded="false" />
-            <element signature="e#5215#5216#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -1851,9 +1247,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="795">
           <caret line="53" column="13" lean-forward="false" selection-start-line="41" selection-start-column="10" selection-end-line="53" selection-end-column="13" />
-          <folding>
-            <element signature="imports" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1879,7 +1272,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
           <caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1923,7 +1315,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="315">
           <caret line="32" column="8" lean-forward="false" selection-start-line="32" selection-start-column="8" selection-end-line="32" selection-end-column="64" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1938,159 +1329,15 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1665">
           <caret line="133" column="45" lean-forward="false" selection-start-line="133" selection-start-column="45" selection-end-line="133" selection-end-column="45" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2809#2810#0" expanded="false" />
-            <element signature="e#2844#2845#0" expanded="false" />
-            <element signature="e#2880#2881#0" expanded="false" />
-            <element signature="e#2912#2913#0" expanded="false" />
-            <element signature="e#2946#2947#0" expanded="false" />
-            <element signature="e#2976#2977#0" expanded="false" />
-            <element signature="e#3008#3009#0" expanded="false" />
-            <element signature="e#3036#3037#0" expanded="false" />
-            <element signature="e#3076#3077#0" expanded="false" />
-            <element signature="e#3114#3115#0" expanded="false" />
-            <element signature="e#3148#3149#0" expanded="false" />
-            <element signature="e#3178#3179#0" expanded="false" />
-            <element signature="e#3213#3214#0" expanded="false" />
-            <element signature="e#3244#3245#0" expanded="false" />
-            <element signature="e#3279#3280#0" expanded="false" />
-            <element signature="e#3310#3311#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="675">
-          <caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#2198#2199#0" expanded="false" />
-            <element signature="e#2248#2249#0" expanded="false" />
-            <element signature="e#2311#2312#0" expanded="false" />
-            <element signature="e#2362#2363#0" expanded="false" />
-            <element signature="e#2416#2417#0" expanded="false" />
-            <element signature="e#2458#2459#0" expanded="false" />
-            <element signature="e#2513#2514#0" expanded="false" />
-            <element signature="e#2556#2557#0" expanded="false" />
-            <element signature="e#2601#2602#0" expanded="false" />
-            <element signature="e#2644#2645#0" expanded="false" />
-            <element signature="e#2689#2690#0" expanded="false" />
-            <element signature="e#2733#2734#0" expanded="false" />
-            <element signature="e#2773#2774#0" expanded="false" />
-            <element signature="e#2812#2813#0" expanded="false" />
-            <element signature="e#2853#2854#0" expanded="false" />
-            <element signature="e#2893#2894#0" expanded="false" />
-            <element signature="e#2938#2939#0" expanded="false" />
-            <element signature="e#2984#2985#0" expanded="false" />
-            <element signature="e#3021#3022#0" expanded="false" />
-            <element signature="e#3056#3057#0" expanded="false" />
-            <element signature="e#3102#3103#0" expanded="false" />
-            <element signature="e#3144#3145#0" expanded="false" />
-            <element signature="e#3194#3195#0" expanded="false" />
-            <element signature="e#3240#3241#0" expanded="false" />
-            <element signature="e#3292#3293#0" expanded="false" />
-            <element signature="e#3340#3341#0" expanded="false" />
-            <element signature="e#3400#3401#0" expanded="false" />
-            <element signature="e#3456#3457#0" expanded="false" />
-            <element signature="e#3499#3500#0" expanded="false" />
-            <element signature="e#3538#3539#0" expanded="false" />
-            <element signature="e#3574#3575#0" expanded="false" />
-            <element signature="e#3606#3607#0" expanded="false" />
-            <element signature="e#3649#3650#0" expanded="false" />
-            <element signature="e#3688#3689#0" expanded="false" />
-            <element signature="e#3732#3733#0" expanded="false" />
-            <element signature="e#3772#3773#0" expanded="false" />
-            <element signature="e#3813#3814#0" expanded="false" />
-            <element signature="e#3850#3851#0" expanded="false" />
-            <element signature="e#3894#3895#0" expanded="false" />
-            <element signature="e#3934#3935#0" expanded="false" />
-            <element signature="e#3979#3980#0" expanded="false" />
-            <element signature="e#4020#4021#0" expanded="false" />
-            <element signature="e#4057#4058#0" expanded="false" />
-            <element signature="e#4090#4091#0" expanded="false" />
-            <element signature="e#4128#4129#0" expanded="false" />
-            <element signature="e#4162#4163#0" expanded="false" />
-            <element signature="e#4210#4211#0" expanded="false" />
-            <element signature="e#4254#4255#0" expanded="false" />
-            <element signature="e#4295#4296#0" expanded="false" />
-            <element signature="e#4332#4333#0" expanded="false" />
-            <element signature="e#4373#4374#0" expanded="false" />
-            <element signature="e#4410#4411#0" expanded="false" />
-            <element signature="e#4451#4452#0" expanded="false" />
-            <element signature="e#4488#4489#0" expanded="false" />
-            <element signature="e#4530#4531#0" expanded="false" />
-            <element signature="e#4568#4569#0" expanded="false" />
-            <element signature="e#4610#4611#0" expanded="false" />
-            <element signature="e#4648#4649#0" expanded="false" />
-            <element signature="e#4688#4689#0" expanded="false" />
-            <element signature="e#4724#4725#0" expanded="false" />
-            <element signature="e#4773#4774#0" expanded="false" />
-            <element signature="e#4817#4818#0" expanded="false" />
-            <element signature="e#4857#4858#0" expanded="false" />
-            <element signature="e#4893#4894#0" expanded="false" />
-            <element signature="e#4931#4932#0" expanded="false" />
-            <element signature="e#4965#4966#0" expanded="false" />
-            <element signature="e#5003#5004#0" expanded="false" />
-            <element signature="e#5037#5038#0" expanded="false" />
-            <element signature="e#5074#5075#0" expanded="false" />
-            <element signature="e#5110#5111#0" expanded="false" />
-            <element signature="e#5165#5166#0" expanded="false" />
-            <element signature="e#5215#5216#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="570">
-          <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#1233#1234#0" expanded="false" />
-            <element signature="e#1265#1266#0" expanded="false" />
-            <element signature="e#1308#1309#0" expanded="false" />
-            <element signature="e#1340#1341#0" expanded="false" />
-            <element signature="e#1380#1381#0" expanded="false" />
-            <element signature="e#1416#1417#0" expanded="false" />
-            <element signature="e#1453#1454#0" expanded="false" />
-            <element signature="e#1486#1487#0" expanded="false" />
-            <element signature="e#1525#1526#0" expanded="false" />
-            <element signature="e#1560#1561#0" expanded="false" />
-            <element signature="e#1597#1598#0" expanded="false" />
-            <element signature="e#1630#1631#0" expanded="false" />
-            <element signature="e#1664#1665#0" expanded="false" />
-            <element signature="e#1694#1695#0" expanded="false" />
-            <element signature="e#1729#1730#0" expanded="false" />
-            <element signature="e#1760#1761#0" expanded="false" />
-            <element signature="e#1797#1798#0" expanded="false" />
-            <element signature="e#1830#1831#0" expanded="false" />
-            <element signature="e#1868#1869#0" expanded="false" />
-            <element signature="e#1902#1903#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/barneyWell.json.bak" />
-    <entry file="file://$PROJECT_DIR$/startup.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="975">
           <caret line="69" column="5" lean-forward="false" selection-start-line="50" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
-          <folding>
-            <element signature="e#754#755#0" expanded="false" />
-            <element signature="e#803#804#0" expanded="false" />
-            <element signature="e#833#834#0" expanded="false" />
-            <element signature="e#881#882#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
@@ -2106,161 +1353,70 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="210">
           <caret line="17" column="33" lean-forward="false" selection-start-line="17" selection-start-column="33" selection-end-line="17" selection-end-column="33" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#1406#1407#0" expanded="false" />
-            <element signature="e#1442#1443#0" expanded="false" />
-            <element signature="e#1486#1487#0" expanded="false" />
-            <element signature="e#1518#1519#0" expanded="false" />
-            <element signature="e#1619#1620#0" expanded="false" />
-            <element signature="e#1656#1657#0" expanded="false" />
-          </folding>
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1245">
-          <caret line="83" column="31" lean-forward="false" selection-start-line="83" selection-start-column="31" selection-end-line="83" selection-end-column="31" />
+        <state relative-caret-position="555">
+          <caret line="37" column="66" lean-forward="false" selection-start-line="37" selection-start-column="66" selection-end-line="37" selection-end-column="66" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="16380">
-          <caret line="1223" column="30" lean-forward="false" selection-start-line="1223" selection-start-column="30" selection-end-line="1223" selection-end-column="30" />
+        <state relative-caret-position="7965">
+          <caret line="660" column="0" lean-forward="false" selection-start-line="660" selection-start-column="0" selection-end-line="660" selection-end-column="0" />
           <folding>
-            <element signature="e#8950#8951#0" expanded="false" />
-            <element signature="e#8975#8976#0" expanded="false" />
-            <element signature="e#9011#9012#0" expanded="false" />
-            <element signature="e#9039#9040#0" expanded="false" />
-            <element signature="e#9084#9085#0" expanded="false" />
-            <element signature="e#9125#9126#0" expanded="false" />
-            <element signature="e#9193#9194#0" expanded="false" />
-            <element signature="e#9253#9254#0" expanded="false" />
-            <element signature="e#9293#9294#0" expanded="false" />
-            <element signature="e#9329#9330#0" expanded="false" />
-            <element signature="e#9387#9388#0" expanded="false" />
-            <element signature="e#9437#9438#0" expanded="false" />
-            <element signature="e#9474#9475#0" expanded="false" />
-            <element signature="e#9507#9508#0" expanded="false" />
-            <element signature="e#9559#9560#0" expanded="false" />
-            <element signature="e#9603#9604#0" expanded="false" />
-            <element signature="e#9636#9637#0" expanded="false" />
-            <element signature="e#9668#9669#0" expanded="false" />
-            <element signature="e#9715#9716#0" expanded="false" />
-            <element signature="e#9757#9758#0" expanded="false" />
-            <element signature="e#9801#9802#0" expanded="false" />
-            <element signature="e#9841#9842#0" expanded="false" />
-            <element signature="e#9907#9908#0" expanded="false" />
-            <element signature="e#9965#9966#0" expanded="false" />
-            <element signature="e#10004#10005#0" expanded="false" />
-            <element signature="e#10039#10040#0" expanded="false" />
-            <element signature="e#10235#10236#0" expanded="false" />
-            <element signature="e#10266#10267#0" expanded="false" />
-            <element signature="e#10493#10494#0" expanded="false" />
-            <element signature="e#10524#10525#0" expanded="false" />
-            <element signature="e#10765#10766#0" expanded="false" />
-            <element signature="e#10794#10795#0" expanded="false" />
-            <element signature="e#10910#10911#0" expanded="false" />
-            <element signature="e#10955#10956#0" expanded="false" />
-            <element signature="e#11079#11080#0" expanded="false" />
-            <element signature="e#11128#11129#0" expanded="false" />
-            <element signature="e#11720#11721#0" expanded="false" />
-            <element signature="e#11759#11760#0" expanded="false" />
-            <element signature="e#11823#11824#0" expanded="false" />
-            <element signature="e#11879#11880#0" expanded="false" />
-            <element signature="e#11919#11920#0" expanded="false" />
-            <element signature="e#11955#11956#0" expanded="false" />
-            <element signature="e#11990#11991#0" expanded="false" />
-            <element signature="e#12021#12022#0" expanded="false" />
-            <element signature="e#12072#12073#0" expanded="false" />
-            <element signature="e#12119#12120#0" expanded="false" />
-            <element signature="e#12162#12163#0" expanded="false" />
-            <element signature="e#12201#12202#0" expanded="false" />
-            <element signature="e#12265#12266#0" expanded="false" />
-            <element signature="e#12321#12322#0" expanded="false" />
-            <element signature="e#12369#12370#0" expanded="false" />
-            <element signature="e#12409#12410#0" expanded="false" />
-            <element signature="e#12444#12445#0" expanded="false" />
-            <element signature="e#12475#12476#0" expanded="false" />
-            <element signature="e#12514#12515#0" expanded="false" />
-            <element signature="e#12549#12550#0" expanded="false" />
-            <element signature="e#12582#12583#0" expanded="false" />
-            <element signature="e#12614#12615#0" expanded="false" />
-            <element signature="e#13216#13217#0" expanded="false" />
-            <element signature="e#13246#13247#0" expanded="false" />
-            <element signature="e#13621#13622#0" expanded="false" />
-            <element signature="e#13666#13667#0" expanded="false" />
-            <element signature="e#13711#13712#0" expanded="false" />
-            <element signature="e#13752#13753#0" expanded="false" />
-            <element signature="e#13802#13803#0" expanded="false" />
-            <element signature="e#13848#13849#0" expanded="false" />
-            <element signature="e#13894#13895#0" expanded="false" />
-            <element signature="e#13936#13937#0" expanded="false" />
-            <element signature="e#13975#13976#0" expanded="false" />
-            <element signature="e#14012#14013#0" expanded="false" />
-            <element signature="e#14070#14071#0" expanded="false" />
-            <element signature="e#14122#14123#0" expanded="false" />
-            <element signature="e#14164#14165#0" expanded="false" />
-            <element signature="e#14204#14205#0" expanded="false" />
-            <element signature="e#14241#14242#0" expanded="false" />
-            <element signature="e#14276#14277#0" expanded="false" />
-            <element signature="e#14316#14317#0" expanded="false" />
-            <element signature="e#14354#14355#0" expanded="false" />
-            <element signature="e#14387#14388#0" expanded="false" />
-            <element signature="e#14419#14420#0" expanded="false" />
-            <element signature="e#14477#14478#0" expanded="false" />
-            <element signature="e#14527#14528#0" expanded="false" />
-            <element signature="e#14589#14590#0" expanded="false" />
-            <element signature="e#14643#14644#0" expanded="false" />
-            <element signature="e#14701#14702#0" expanded="false" />
-            <element signature="e#14751#14752#0" expanded="false" />
-            <element signature="e#14791#14792#0" expanded="false" />
-            <element signature="e#14827#14828#0" expanded="false" />
-            <element signature="e#14869#14870#0" expanded="false" />
-            <element signature="e#14907#14908#0" expanded="false" />
-            <element signature="e#14947#14948#0" expanded="false" />
-            <element signature="e#14983#14984#0" expanded="false" />
-            <element signature="e#15017#15018#0" expanded="false" />
-            <element signature="e#15047#15048#0" expanded="false" />
-            <element signature="e#15093#15094#0" expanded="false" />
-            <element signature="e#15131#15132#0" expanded="false" />
-            <element signature="e#15172#15173#0" expanded="false" />
-            <element signature="e#15212#15213#0" expanded="false" />
-            <element signature="e#15259#15260#0" expanded="false" />
-            <element signature="e#15295#15296#0" expanded="false" />
-            <element signature="e#15339#15340#0" expanded="false" />
-            <element signature="e#15381#15382#0" expanded="false" />
-            <element signature="e#15434#15435#0" expanded="false" />
-            <element signature="e#15483#15484#0" expanded="false" />
-            <element signature="e#15681#15682#0" expanded="false" />
-            <element signature="e#15718#15719#0" expanded="false" />
-            <element signature="e#15775#15776#0" expanded="false" />
-            <element signature="e#15827#15828#0" expanded="false" />
-            <element signature="e#15874#15875#0" expanded="false" />
-            <element signature="e#15919#15920#0" expanded="false" />
-            <element signature="e#17811#17812#0" expanded="false" />
-            <element signature="e#17846#17847#0" expanded="false" />
+            <element signature="imports" expanded="true" />
+            <element signature="e#21388#21389#0" expanded="true" />
+            <element signature="e#21434#21435#0" expanded="true" />
+            <element signature="e#21628#21629#0" expanded="true" />
+            <element signature="e#21674#21675#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="352">
-          <caret line="65" column="61" lean-forward="false" selection-start-line="65" selection-start-column="61" selection-end-line="65" selection-end-column="61" />
+        <state relative-caret-position="139">
+          <caret line="110" column="58" lean-forward="false" selection-start-line="110" selection-start-column="58" selection-end-line="110" selection-end-column="58" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="675">
+          <caret line="52" column="41" lean-forward="false" selection-start-line="52" selection-start-column="41" selection-end-line="52" selection-end-column="41" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/WellTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="570">
+          <caret line="43" column="10" lean-forward="false" selection-start-line="43" selection-start-column="4" selection-end-line="43" selection-end-column="10" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="559">
-          <caret line="302" column="19" lean-forward="true" selection-start-line="302" selection-start-column="19" selection-end-line="302" selection-end-column="19" />
+        <state relative-caret-position="4455">
+          <caret line="321" column="54" lean-forward="false" selection-start-line="321" selection-start-column="54" selection-end-line="321" selection-end-column="54" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/startup.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
           <folding />
         </state>
       </provider>
diff --git a/README.md b/README.md
index 7af1e47..01c8d03 100644
--- a/README.md
+++ b/README.md
@@ -45,40 +45,41 @@ systemctl enable mongod.service
 
 # Local Web API
 
-## Endpoint `/config?`
-
-### `update=<doUpdate:string>`
-- if doUpdate = `true`, the well configuration will be updated.
-- returns `{"configUpdated: <result>"}`
-
-### `fluidOilRatio=<newRatio:double>`
-- sets the fluidOilRatio (BBL oil to every 1 BBL fluid producted) to `newRatio`
-- returns `{"fluidOilRatio": <fluidOilRatio>}`
-
-### `fluidWaterRatio=<newRatio:double>`
-- sets the fluidWaterRatio (BBL water to every 1 BBL fluid producted) to `newRatio`
-- returns `{"fluidWaterRatio": <fluidWaterRatio>}`
-
-### `fluidGasMCFRatio=<newRatio:double>`
-- sets the fluidGasMCFRatio (MCF gas to every 1 BBL fluid producted) to `newRatio`
-- returns `{"fluidGasMCFRatio": <fluidGasMCFRatio>}`
-
-### `pumpOffSetpoint=<newSetpoint:double>`
-- sets the pump-off fill percent setpoint to `newSetpoint`
-- returns `{"pumpOffSetpoint": <pumpOffSetpoint>}`
-
-### `pumpOffStrokes=<newSetpoint:long>`
-- sets the number of low-fillage strokes required for pump-off to `newSetpoint`
-- returns `{"pumpOffStrokes": <pumpOffStrokes>}`
-
-### `pumpOffDowntime=<newSetpoint:long>`
-- sets the minutes of downtime after pumpoff to `newSetpoint`
-- returns `{"pumpOffDowntime": <pumpOffDowntime>}`
 
 ## Endpoint `/command?cmd=<command>&user=<username>`
+- Attempts to give the command to the unit.
+- Allowed values:
+    - start
+    - stop
+- returns `{"status": <string: runStatus>}`
 
-### `start`
-- returns `{"startCommand: <result>", "status": <runStatus>}`
+## Endpoint `/update?wellconfig`
+- Updates the well configuration with values stored in
+    1. wellConfig.json
+    2. MongoDB database (configured via website)
+- returns `{"configUpdated": <bool: updatestatus>}`
 
-### `stop`
-- returns `{"stopCommand: <result>", "status": <runStatus>}`
+## Endpoint `/update?setpoint=<variable name>`
+- Updates the value of the variable name supplied from values in the database.
+- Allowed values:
+    - fluidOilRatio
+    - fluidWaterRatio
+    - fluidGasRatio
+    - pumpOffFillPercentSetpoint
+    - pumpOffStrokesSetpoint
+    - pumpOffDowntimeMinutesSetpoint
+    - timerOffMinutesSetpoint
+    - timerRunMinutesSetpoint
+- returns `{<string: variable name>: <double: variable value>}`
+
+## Endpoint `/mode?mode=<commanded mode>&user=<username>`
+- Attempts to change to mode of the unit to the commanded mode.
+- Allowed values:
+    - manual
+    - poc
+    - timer
+- returns `{"runMode": <string: runMode>}`
+
+## Endpoint `/shake`
+- Used to verify the POC is active
+- returns `{"shake": "shook"}`
diff --git a/src/main/java/com/henrypump/poc/Database.java b/src/main/java/com/henrypump/poc/Database.java
index c8d5256..7aa8bb1 100644
--- a/src/main/java/com/henrypump/poc/Database.java
+++ b/src/main/java/com/henrypump/poc/Database.java
@@ -9,11 +9,9 @@ import com.mongodb.*;
 import com.mongodb.client.AggregateIterable;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.Accumulators;
-import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.*;
 
-import com.mongodb.client.model.Indexes;
-import com.mongodb.client.model.Sorts;
+import org.bson.BSON;
 import org.bson.Document;
 
 import java.io.BufferedReader;
@@ -60,6 +58,7 @@ public class Database {
         wellConfigCollection.createIndex(Indexes.ascending("timestamp"));
 
         setpointCollection = database.getCollection("setpoints");
+        setpointCollection.createIndex(Indexes.ascending("name"));
     }
 
 
@@ -306,5 +305,28 @@ public class Database {
         return lastConfig;
     }
 
+    public long storeSetpoint(String setpointName, double setpointValue){
+        Document newSetpoint = new Document("name", setpointName)
+                .append("value", setpointValue)
+                .append("lastStored", Date.from(ZonedDateTime.now().toInstant()))
+                .append("storedBy", "poc");
+        setpointCollection.updateOne(eq("name", setpointName), new Document("$set", newSetpoint), (new UpdateOptions()).upsert(true));
+        return setpointCollection.count();
+
+    }
+
+    public Double getSetpoint(String setpointName){
+        Document setpointDoc = setpointCollection.find(eq("name", setpointName)).first();
+        double setpoint;
+        try {
+            setpoint = setpointDoc.getDouble("value");
+            String storedBy = setpointDoc.getString("storedBy");
+            System.out.println("Setpoint retrieved from database: [" + setpointName + " = " + setpoint + " stored by " + storedBy + "]");
+        } catch (NullPointerException e){
+            setpoint = Double.MIN_VALUE;
+            System.out.println("Could not find a value for " + setpointName + " in the database.");
+        }
+        return setpoint;
+    }
 
 }
diff --git a/src/main/java/com/henrypump/poc/POC.java b/src/main/java/com/henrypump/poc/POC.java
index 7cbe121..ca6696f 100644
--- a/src/main/java/com/henrypump/poc/POC.java
+++ b/src/main/java/com/henrypump/poc/POC.java
@@ -36,7 +36,6 @@ public class POC implements Runnable{
             new Thread(new IOControl(this)).start();
         }
         long sleepMilliseconds = (long) (thisWell.getDt() * 1000);
-        thisWell.setupFluidRatio(0.50, 0.50, 1.12);
         thisWell.checkSafeties();
         while (true) {
             for (int i = 0; i <= thisWell.sim.getLastFilledIndex(); i++) {
diff --git a/src/main/java/com/henrypump/poc/WebServer.java b/src/main/java/com/henrypump/poc/WebServer.java
index aaf1e98..a5af539 100644
--- a/src/main/java/com/henrypump/poc/WebServer.java
+++ b/src/main/java/com/henrypump/poc/WebServer.java
@@ -25,8 +25,9 @@ public class WebServer{
         this.port = port;
         HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
         server.createContext("/command", new CommandHandler());
-        server.createContext("/config", new ConfigHandler());
+        server.createContext("/update", new UpdateHandler());
         server.createContext("/shake", new HandshakeHandler());
+        server.createContext("/mode", new ModeHandler());
         server.setExecutor(null); // creates a default executor
         server.start();
     }
@@ -95,89 +96,73 @@ public class WebServer{
     }
 
 
-    class ConfigHandler implements HttpHandler {
+    class UpdateHandler implements HttpHandler {
         @Override
         public void handle(HttpExchange t) throws IOException {
             JSONObject respJSON = new JSONObject();
             Map<String, String> params = queryToMap(t.getRequestURI().getQuery());
+
             for(Map.Entry<String, String> param_map : params.entrySet()){
                 String key = param_map.getKey();
                 String param = param_map.getValue();
+                double newSP;
+                if (key.equals("wellconfig")) {
+                    attachedPOC.thisWell.getWellSetup();
+                    respJSON.put("configUpdated", "true");
+                    continue;
+                } else if (key.equals("setpoint")) {
+                    newSP = attachedPOC.thisWell.db.getSetpoint(param);
+                    if (newSP == Double.MIN_VALUE) {
+                        respJSON.put("no entry", key);
+                        continue;
+                    }
 
-                switch (key){
-                    case "update":
-                        if(param.equals("true")) {
-                            attachedPOC.thisWell.getWellSetup();
-                            respJSON.put("configUpdated", "true");
-                        } else {
-                            respJSON.put("configUpdated", "invalid value - " + param);
-                        }
-                        break;
+                    switch (param) {
+                        case "fluidOilRatio":
+                            attachedPOC.thisWell.setFluidOilRatio(newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getFluidOilRatio());
+                            break;
 
-                    case "fluidOilRatio":
-                        try {
-                            double newSetpoint = Double.parseDouble(param);
-                            attachedPOC.thisWell.setFluidOilRatio(newSetpoint);
-                            respJSON.put("fluidOilRatio", attachedPOC.thisWell.getFluidOilRatio());
-                        } catch (NullPointerException | NumberFormatException e) {
-                            respJSON.put("fluidOilRatio", "invalid value - " + param);
-                        }
-                        break;
+                        case "fluidWaterRatio":
+                            attachedPOC.thisWell.setFluidWaterRatio(newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getFluidWaterRatio());
+                            break;
 
-                    case "fluidWaterRatio":
-                        try {
-                            double newSetpoint = Double.parseDouble(param);
-                            attachedPOC.thisWell.setFluidWaterRatio(newSetpoint);
-                            respJSON.put("fluidWaterRatio", attachedPOC.thisWell.getFluidWaterRatio());
-                        } catch (NullPointerException | NumberFormatException e) {
-                            respJSON.put("fluidWaterRatio", "invalid value - " + param);
-                        }
-                        break;
+                        case "fluidGasRatio":
+                            attachedPOC.thisWell.setFluidGasRatio(newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getFluidGasRatio());
+                            break;
 
-                    case "fluidGasMCFRatio":
-                        try {
-                            double newSetpoint = Double.parseDouble(param);
-                            attachedPOC.thisWell.setFluidGasRatio(newSetpoint);
-                            respJSON.put("fluidGasMCFRatio", attachedPOC.thisWell.getFluidGasRatio());
-                        } catch (NullPointerException | NumberFormatException e) {
-                            respJSON.put("fluidGasMCFRatio", "invalid value - " + param);
-                        }
-                        break;
+                        case "pumpOffFillPercentSetpoint":
+                            attachedPOC.thisWell.setPumpOffFillPercentSetpoint(newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getPumpOffFillPercentSetpoint());
+                            break;
 
-                    case "pumpOffSetpoint":
-                        try {
-                            double newSetpoint = Double.parseDouble(param);
-                            attachedPOC.thisWell.setPumpOffFillPercentSetpoint(newSetpoint);
-                            respJSON.put("pumpOffSetpoint", attachedPOC.thisWell.getPumpOffFillPercentSetpoint());
-                        } catch (NullPointerException | NumberFormatException e) {
-                            respJSON.put("pumpOffSetpoint", "invalid value - " + param);
-                        }
-                        break;
+                        case "pumpOffStrokesSetpoint":
+                            attachedPOC.thisWell.setPumpOffStrokesSetpoint((int) newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getPumpOffStrokesSetpoint());
+                            break;
 
-                    case "pumpOffStrokes":
-                        try {
-                            int newSetpoint = Integer.parseInt(param);
-                            attachedPOC.thisWell.setPumpOffStrokes(newSetpoint);
-                            respJSON.put("pumpOffStrokes", attachedPOC.thisWell.getPumpOffStrokes());
-                        } catch (NullPointerException | NumberFormatException e) {
-                            respJSON.put("pumpOffStrokes", "invalid value - " + param);
-                        }
-                        break;
+                        case "pumpOffDowntimeMinutesSetpoint":
+                            attachedPOC.thisWell.setPumpOffDowntimeMinutesSetpoint((long) newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getPumpOffDowntimeMinutesSetpoint());
+                            break;
 
-                    case "pumpOffDowntime":
-                        try {
-                            long newSetpoint = Long.parseLong(param);
-                            attachedPOC.thisWell.setPumpOffDowntimeMinutes(newSetpoint);
-                            respJSON.put("pumpOffDowntime", attachedPOC.thisWell.getPumpOffDowntimeMinutes());
-                        } catch (NullPointerException | NumberFormatException e) {
-                            respJSON.put("pumpOffDowntime", "invalid value - " + param);
-                        }
-                        break;
+                        case "timerOffMinutesSetpoint":
+                            attachedPOC.thisWell.setTimerOffMinutesSetpoint((long) newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getTimerOffMinutesSetpoint());
+                            break;
 
-                    default:
-                        respJSON.put(key, "not implemented");
-                        break;
+                        case "timerRunMinutesSetpoint":
+                            attachedPOC.thisWell.setTimerRunMinutesSetpoint((long) newSP);
+                            respJSON.put(param, attachedPOC.thisWell.getTimerRunMinutesSetpoint());
+                            break;
 
+                        default:
+                            respJSON.put(param, "not implemented");
+                            break;
+
+                    }
                 }
 
             }
@@ -201,7 +186,54 @@ public class WebServer{
             os.close();
         }
     }
+
+    class ModeHandler implements HttpHandler {
+        @Override
+        public void handle(HttpExchange t) throws IOException {
+            JSONObject respJSON = new JSONObject();
+            Map<String, String> params = queryToMap(t.getRequestURI().getQuery());
+            String action = "";
+            String user = "";
+            for(Map.Entry<String, String> param_map : params.entrySet()){
+                String key = param_map.getKey();
+                String param = param_map.getValue();
+
+                switch (key) {
+                    case "mode":
+                        action = param;
+                        break;
+                    case "user":
+                        user = param;
+                        break;
+                    default:
+                        respJSON.put(key, "not implemented");
+
+                }
+            }
+            if ((user.length() > 0) && (action.length() > 0)) {
+                switch (action) {
+                    case "manual":
+                        attachedPOC.thisWell.setRunMode("MANUAL");
+                        break;
+                    case "poc":
+                        attachedPOC.thisWell.setRunMode("POC");
+                        break;
+                    case "timer":
+                        attachedPOC.thisWell.setRunMode("TIMER");
+                        break;
+                    default:
+                        respJSON.put(action, "not implemented");
+                        break;
+                }
+                respJSON.put("runMode", attachedPOC.thisWell.getRunModeString());
+            } else {
+                respJSON.put("bad request", "cmd and user parameters required");
+            }
+            String response = respJSON.toJSONString();
+            t.sendResponseHeaders(200, response.getBytes().length);
+            OutputStream os = t.getResponseBody();
+            os.write(response.getBytes());
+            os.close();
+        }
+    }
 }
-
-
-
diff --git a/src/main/java/com/henrypump/poc/Well.java b/src/main/java/com/henrypump/poc/Well.java
index ed82596..8e39e08 100644
--- a/src/main/java/com/henrypump/poc/Well.java
+++ b/src/main/java/com/henrypump/poc/Well.java
@@ -11,9 +11,7 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
-import static java.lang.Math.exp;
-import static java.lang.Math.pow;
-import static java.lang.Math.sqrt;
+
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
@@ -22,6 +20,8 @@ import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 
+import static java.lang.Math.*;
+
 /**
  * Created by patrickjmcd on 1/31/17.
  */
@@ -174,15 +174,33 @@ public class Well {
     private Measurement tubingMovement;
     private Measurement pumpFillPercent;
 
-    // Running Setpoints
-    private double pumpOffFillPercentSetpoint = 65;
-    private int pumpOffStrokes = 5;
+    private ZonedDateTime pumpStartTime;
+
+    // POC Mode Setpoints
+    private double pumpOffFillPercentSetpoint;
+    private int pumpOffStrokesSetpoint;
+    private long pumpOffDowntimeMinutesSetpoint;
+
+    // POC Mode Status
     private int lowFillageStrokes = 0;
     private ZonedDateTime pumpedOffTime;
-    private long pumpOffDowntimeMinutes = 5;
     private long minutesSincePumpOff = 0;
     private long minutesSincePumpOff_last = 0;
 
+
+    // Timer Mode Setpoints
+    private long timerRunMinutesSetpoint;
+    private long timerOffMinutesSetpoint;
+
+    // Timer Mode status
+
+    private ZonedDateTime timerStopTime;
+    private long minutesSinceTimerStop = 0;
+    private long minutesSinceTimerStop_last = 0;
+    private long minutesSinceTimerStart = 0;
+    private long minutesSinceTimerStart_last = 0;
+
+
     Well(String dbHostname, int inclinometerChannel, int loadCellChannel, int runCommandChannel){
         this.wellName = wellName;
         db = new Database(dbHostname);
@@ -192,6 +210,7 @@ public class Well {
         loadCell = new AnalogIn(loadCellChannel, 0, 50000, 0, 50000);
 
         initializeMeasurements();
+        initializeSetpoints();
         db.newRunStatus("Boot", "io");
     }
 
@@ -205,9 +224,89 @@ public class Well {
         loadCell = new AnalogIn(loadCellChannel, 0, 50000, 0, 50000);
 
         initializeMeasurements();
+        initializeSetpoints();
         db.newRunStatus("Boot", "commandline");
     }
 
+    private void initializeSetpoints(){
+        /**
+         * intializeSetpoints
+         * This function will retrieve setpoint data from the mongodb instance.
+         * If there is no setpoint stored in the database, a default value will be used.
+         */
+        double dbPumpOffFillPercentSetpoint = db.getSetpoint("pumpOffFillPercentSetpoint");
+        if (dbPumpOffFillPercentSetpoint == Double.MIN_VALUE){
+            pumpOffFillPercentSetpoint = 65.0; // DEFAULT VALUE
+            System.out.println("Using default value of " + pumpOffFillPercentSetpoint + " for PumpOffFillPercentSetpoint.");
+            db.storeSetpoint("pumpOffFillPercentSetpoint", pumpOffFillPercentSetpoint);
+        } else {
+            pumpOffFillPercentSetpoint = dbPumpOffFillPercentSetpoint;
+        }
+
+        double dbPumpOffStrokes = db.getSetpoint("pumpOffStrokesSetpoint");
+        if (dbPumpOffStrokes == Double.MIN_VALUE){
+            pumpOffStrokesSetpoint = 5; // DEFAULT VALUE
+            System.out.println("Using default value of " + pumpOffStrokesSetpoint + " for pumpOffStrokesSetpoint.");
+            db.storeSetpoint("pumpOffStrokesSetpoint", (double) pumpOffStrokesSetpoint);
+        } else {
+            pumpOffStrokesSetpoint = (int) dbPumpOffStrokes;
+        }
+
+        double dbPumpOffDowntimeMinutesSetpoint = db.getSetpoint("pumpOffDowntimeMinutesSetpoint");
+        if (dbPumpOffDowntimeMinutesSetpoint == Double.MIN_VALUE){
+            pumpOffDowntimeMinutesSetpoint = 30; // DEFAULT VALUE
+            System.out.println("Using default value of " + pumpOffDowntimeMinutesSetpoint + " for pumpOffDowntimeMinutesSetpoint.");
+            db.storeSetpoint("pumpOffDowntimeMinutesSetpoint", (double) pumpOffDowntimeMinutesSetpoint);
+        } else {
+            pumpOffDowntimeMinutesSetpoint = (long) dbPumpOffDowntimeMinutesSetpoint;
+        }
+
+        double dbTimerRunMinutesSetpoint = db.getSetpoint("timerRunMinutesSetpoint");
+        if (dbTimerRunMinutesSetpoint == Double.MIN_VALUE){
+            timerRunMinutesSetpoint = 45; // DEFAULT VALUE
+            System.out.println("Using default value of " + timerRunMinutesSetpoint + " for timerRunMinutesSetpoint.");
+            db.storeSetpoint("timerRunMinutesSetpoint", (double) timerRunMinutesSetpoint);
+        } else {
+            timerRunMinutesSetpoint = (long) dbTimerRunMinutesSetpoint;
+        }
+
+        double dbTimerOffMinutesSetpoint = db.getSetpoint("timerOffMinutesSetpoint");
+        if (dbTimerOffMinutesSetpoint == Double.MIN_VALUE){
+            timerOffMinutesSetpoint = 15; // DEFAULT VALUE
+            System.out.println("Using default value of " + timerOffMinutesSetpoint + " for timerOffMinutesSetpoint.");
+            db.storeSetpoint("timerOffMinutesSetpoint", (double) timerOffMinutesSetpoint);
+        } else {
+            timerOffMinutesSetpoint = (long) dbTimerOffMinutesSetpoint;
+        }
+
+        double dbFluidOilRatio = db.getSetpoint("fluidOilRatio");
+        if (dbFluidOilRatio == Double.MIN_VALUE){
+            fluidOilRatio = 0.5; // DEFAULT VALUE
+            System.out.println("Using default value of " + fluidOilRatio + " for fluidOilRatio.");
+            db.storeSetpoint("fluidOilRatio", (double) fluidOilRatio);
+        } else {
+            fluidOilRatio = dbFluidOilRatio;
+        }
+
+        double dbFluidWaterRatio = db.getSetpoint("fluidWaterRatio");
+        if (dbFluidWaterRatio == Double.MIN_VALUE){
+            fluidWaterRatio = 0.5; // DEFAULT VALUE
+            System.out.println("Using default value of " + fluidWaterRatio + " for fluidWaterRatio.");
+            db.storeSetpoint("fluidWaterRatio", (double) fluidWaterRatio);
+        } else {
+            fluidWaterRatio = dbFluidWaterRatio;
+        }
+
+        double dbFluidGasRatio = db.getSetpoint("fluidGasRatio");
+        if (dbFluidGasRatio == Double.MIN_VALUE){
+            fluidGasRatio = 2; // DEFAULT VALUE
+            System.out.println("Using default value of " + fluidGasRatio + " for fluidGasRatio.");
+            db.storeSetpoint("fluidGasRatio", (double) fluidGasRatio);
+        } else {
+            fluidGasRatio = dbFluidGasRatio;
+        }
+    }
+
     private void initializeMeasurements(){
         strokeSpeed = new Measurement("Stroke Speed", db, 0.5, 600);
         downholeGrossStroke = new Measurement("Downhole Gross Stroke", db, 0.5, 600);
@@ -422,6 +521,22 @@ public class Well {
         }
     }
 
+    public void setRunMode(String runModeString){
+        switch (runModeString){
+            case "POC":
+                runMode = RUNMODE_POC;
+                break;
+            case "MANUAL":
+                runMode = RUNMODE_MANUAL;
+                break;
+            case "TIMER":
+                runMode = RUNMODE_TIMER;
+                break;
+            default:
+                break;
+        }
+    }
+
     public double getCurrentSurfacePosition() {
         return currentSurfacePosition;
     }
@@ -514,20 +629,20 @@ public class Well {
         this.pumpOffFillPercentSetpoint = pumpOffFillPercentSetpoint;
     }
 
-    public int getPumpOffStrokes() {
-        return pumpOffStrokes;
+    public int getPumpOffStrokesSetpoint() {
+        return pumpOffStrokesSetpoint;
     }
 
-    public void setPumpOffStrokes(int pumpOffStrokes) {
-        this.pumpOffStrokes = pumpOffStrokes;
+    public void setPumpOffStrokesSetpoint(int pumpOffStrokesSetpoint) {
+        this.pumpOffStrokesSetpoint = pumpOffStrokesSetpoint;
     }
 
-    public long getPumpOffDowntimeMinutes() {
-        return pumpOffDowntimeMinutes;
+    public long getPumpOffDowntimeMinutesSetpoint() {
+        return pumpOffDowntimeMinutesSetpoint;
     }
 
-    public void setPumpOffDowntimeMinutes(long pumpOffDowntimeMinutes) {
-        this.pumpOffDowntimeMinutes = pumpOffDowntimeMinutes;
+    public void setPumpOffDowntimeMinutesSetpoint(long pumpOffDowntimeMinutesSetpoint) {
+        this.pumpOffDowntimeMinutesSetpoint = pumpOffDowntimeMinutesSetpoint;
     }
 
     public void setupFluidRatio(double oilRatio, double waterRatio, double gasRatio){
@@ -536,12 +651,29 @@ public class Well {
         fluidGasRatio = gasRatio;
     }
 
+    public long getTimerRunMinutesSetpoint() {
+        return timerRunMinutesSetpoint;
+    }
+
+    public void setTimerRunMinutesSetpoint(long timerRunMinutesSetpoint) {
+        this.timerRunMinutesSetpoint = timerRunMinutesSetpoint;
+    }
+
+    public long getTimerOffMinutesSetpoint() {
+        return timerOffMinutesSetpoint;
+    }
+
+    public void setTimerOffMinutesSetpoint(long timerOffMinutesSetpoint) {
+        this.timerOffMinutesSetpoint = timerOffMinutesSetpoint;
+    }
+
     // WELL COMMAND FUNCTIONS
     public void start(String initiator){
         if (runStatus == RUNSTATUS_STOPPED && permissiveOK){
             System.out.println("Starting " + wellName + " from " + initiator + "...");
             runStatus = RUNSTATUS_STARTING;
             strokesSinceStart = 0;
+            pumpStartTime = ZonedDateTime.now();
             db.newRunStatus(getRunStatusString(), initiator);
         }
     }
@@ -566,8 +698,13 @@ public class Well {
     public void pumpOff(String initiator){
         if (runStatus == RUNSTATUS_RUNNING){
             System.out.println("Pumping off from " + initiator + "...");
-            System.out.println("Restarting in " + pumpOffDowntimeMinutes + " minutes.");
-            pumpedOffTime = ZonedDateTime.now();
+            if (runMode == RUNMODE_POC) {
+                System.out.println("Restarting in " + pumpOffDowntimeMinutesSetpoint + " minutes.");
+                pumpedOffTime = ZonedDateTime.now();
+            } else if (runMode == RUNMODE_TIMER){
+                System.out.println("Restarting in " + timerOffMinutesSetpoint + " minutes.");
+                timerStopTime = ZonedDateTime.now();
+            }
             runStatus = RUNSTATUS_PUMPEDOFF;
             db.newRunStatus(getRunStatusString(), initiator);
         }
@@ -1115,14 +1252,16 @@ public class Well {
         }
 
         if (runStatus == RUNSTATUS_RUNNING) {
-            if (pumpFillPercent.getCurrentValue() < pumpOffFillPercentSetpoint) {
-                lowFillageStrokes++;
-            } else {
-                lowFillageStrokes = 0;
-            }
+            if (runMode == RUNMODE_POC){
+                if (pumpFillPercent.getCurrentValue() < pumpOffFillPercentSetpoint) {
+                    lowFillageStrokes++;
+                } else {
+                    lowFillageStrokes = 0;
+                }
 
-            if (lowFillageStrokes > pumpOffStrokes) {
-                pumpOff("lowpumpfill");
+                if (lowFillageStrokes > pumpOffStrokesSetpoint) {
+                    pumpOff("lowpumpfill");
+                }
             }
         }
 
@@ -1181,20 +1320,44 @@ public class Well {
             pointCounter++;
         }
 
-        if (runStatus == RUNSTATUS_PUMPEDOFF){
-            minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpedOffTime);
-            if(minutesSincePumpOff_last != minutesSincePumpOff){
-                System.out.println("Restarting in " + (pumpOffDowntimeMinutes - minutesSincePumpOff) + " minutes.");
-                minutesSincePumpOff_last = minutesSincePumpOff;
+        if (runMode == RUNMODE_POC) {
+            if (runStatus == RUNSTATUS_PUMPEDOFF) {
+                minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpedOffTime);
+                if (minutesSincePumpOff_last != minutesSincePumpOff) {
+                    System.out.println("Restarting in " + (pumpOffDowntimeMinutesSetpoint - minutesSincePumpOff) + " minutes.");
+                    minutesSincePumpOff_last = minutesSincePumpOff;
+                }
+                if (minutesSincePumpOff > pumpOffDowntimeMinutesSetpoint) {
+                    restart("pumpoffdowntime");
+                }
             }
-            if (minutesSincePumpOff > pumpOffDowntimeMinutes){
-                restart("pumpoffdowntime");
+        }
+        else if (runMode == RUNMODE_TIMER) {
+            if(runStatus == RUNSTATUS_STARTING || runStatus == RUNSTATUS_RUNNING) {
+                minutesSinceTimerStart = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpStartTime);
+                if (minutesSinceTimerStart_last != minutesSinceTimerStart) {
+                    System.out.println("Timer stopping in " + (timerRunMinutesSetpoint - minutesSinceTimerStart) + " minutes.");
+                    minutesSinceTimerStart_last = minutesSinceTimerStart;
+                }
+                if (minutesSinceTimerStart > timerRunMinutesSetpoint) {
+                    pumpOff("timer");
+                }
+            } else if(runStatus == RUNSTATUS_PUMPEDOFF) {
+                minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), timerStopTime);
+                if (minutesSincePumpOff_last != minutesSincePumpOff) {
+                    System.out.println("Timer stopping in " + (timerOffMinutesSetpoint - minutesSinceTimerStop) + " minutes.");
+                    minutesSinceTimerStop_last = minutesSinceTimerStop;
+                }
+                if (minutesSinceTimerStop > timerOffMinutesSetpoint) {
+                    restart("timer");
+                }
             }
         }
 
         if(isNewDay()){
             gaugeOff();
         }
+
     }
 
     public void eval(int simPoint){
@@ -1227,14 +1390,37 @@ public class Well {
             pointCounter++;
         }
 
-        if (runStatus == RUNSTATUS_PUMPEDOFF){
-            minutesSincePumpOff = ChronoUnit.MINUTES.between(pumpedOffTime, ZonedDateTime.now());
-            if(minutesSincePumpOff_last != minutesSincePumpOff){
-                System.out.println("Restarting in " + (pumpOffDowntimeMinutes - minutesSincePumpOff) + " minutes.");
-                minutesSincePumpOff_last = minutesSincePumpOff;
+        if (runMode == RUNMODE_POC) {
+            if (runStatus == RUNSTATUS_PUMPEDOFF) {
+                minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpedOffTime);
+                if (minutesSincePumpOff_last != minutesSincePumpOff) {
+                    System.out.println("Restarting in " + (pumpOffDowntimeMinutesSetpoint - minutesSincePumpOff) + " minutes.");
+                    minutesSincePumpOff_last = minutesSincePumpOff;
+                }
+                if (minutesSincePumpOff > pumpOffDowntimeMinutesSetpoint) {
+                    restart("pumpoffdowntime");
+                }
             }
-            if (minutesSincePumpOff > pumpOffDowntimeMinutes){
-                restart("pumpoffdowntime");
+        }
+        else if (runMode == RUNMODE_TIMER) {
+            if(runStatus == RUNSTATUS_STARTING || runStatus == RUNSTATUS_RUNNING) {
+                minutesSinceTimerStart = ChronoUnit.MINUTES.between(ZonedDateTime.now(), pumpStartTime);
+                if (minutesSinceTimerStart_last != minutesSinceTimerStart) {
+                    System.out.println("Timer stopping in " + (timerRunMinutesSetpoint - minutesSinceTimerStart) + " minutes.");
+                    minutesSinceTimerStart_last = minutesSinceTimerStart;
+                }
+                if (minutesSinceTimerStart > timerRunMinutesSetpoint) {
+                    pumpOff("timer");
+                }
+            } else if(runStatus == RUNSTATUS_PUMPEDOFF) {
+                minutesSincePumpOff = ChronoUnit.MINUTES.between(ZonedDateTime.now(), timerStopTime);
+                if (minutesSincePumpOff_last != minutesSincePumpOff) {
+                    System.out.println("Timer stopping in " + (timerOffMinutesSetpoint - minutesSinceTimerStop) + " minutes.");
+                    minutesSinceTimerStop_last = minutesSinceTimerStop;
+                }
+                if (minutesSinceTimerStop > timerOffMinutesSetpoint) {
+                    restart("timer");
+                }
             }
         }
 
diff --git a/www/pocwww/pocwww/__init__.py b/www/pocwww/pocwww/__init__.py
index 82d7d9d..3d82ccd 100644
--- a/www/pocwww/pocwww/__init__.py
+++ b/www/pocwww/pocwww/__init__.py
@@ -20,6 +20,7 @@ from pymongo import MongoClient
 from_zone = tz.tzutc()
 to_zone = tz.tzlocal()
 
+
 def format_datetime(inpDate, format='medium'):
     inpDate = inpDate.replace(tzinfo=from_zone)
     localDate = inpDate.astimezone(to_zone)
@@ -186,7 +187,5 @@ def main(global_config, **settings):
 
     config.add_route("json_users", "/json/users", factory='pocwww.security.UserLoginFactory')
 
-
-
     config.scan()
     return config.make_wsgi_app()