From a0fd15bade662f56a0399a2c2c77885b4ae9e71d Mon Sep 17 00:00:00 2001
From: Patrick McDonagh <patrickjmcd@gmail.com>
Date: Wed, 28 Jun 2017 08:17:42 -0500
Subject: [PATCH] Working on conversion from MongoDB to Postgresql

---
 .idea/dbnavigator.xml                         |  10 +-
 ..._org_postgresql_postgresql_42_1_1_jre8.xml |   9 +
 .idea/modules/poc-java_main.iml               |   9 +-
 .idea/modules/poc-java_test.iml               |  10 +-
 .idea/workspace.xml                           | 704 ++++--------------
 build.gradle                                  |   1 +
 db_setup.sql                                  |   8 +-
 libs/IOBoard-RPi-0.1.jar                      | Bin 18589 -> 19152 bytes
 src/main/java/com/henrypump/poc/Database.java | 223 +++++-
 .../java/com/henrypump/poc/Measurement.java   |   7 +-
 10 files changed, 398 insertions(+), 583 deletions(-)
 create mode 100644 .idea/libraries/Gradle__org_postgresql_postgresql_42_1_1_jre8.xml

diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml
index 74f8e78..2b3c5d5 100644
--- a/.idea/dbnavigator.xml
+++ b/.idea/dbnavigator.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="DBNavigator.Project.DataEditorManager">
     <record-view-column-sorting-type value="BY_INDEX" />
-    <value-preview-text-wrapping value="true" />
+    <value-preview-text-wrapping value="false" />
     <value-preview-pinned value="false" />
   </component>
   <component name="DBNavigator.Project.DataExportManager">
@@ -25,7 +25,7 @@
     <show-object-properties value="true" />
     <loaded-nodes>
       <connection connection-id="94a6cabe-5b17-467d-a87c-dc17d3749f25">
-        <schema name="information_schema" object-types="function, table" />
+        <schema name="information_schema" object-types="table" />
         <schema name="pg_catalog" object-types="table" />
         <schema name="public" object-types="table" />
       </connection>
@@ -58,7 +58,9 @@
     <filters />
   </component>
   <component name="DBNavigator.Project.ScriptExecutionManager" clear-outputs="true">
-    <recently-used-interfaces />
+    <recently-used-interfaces>
+      <mapping database-type="POSTGRES" interface-id="DEFAULT" />
+    </recently-used-interfaces>
   </component>
   <component name="DBNavigator.Project.Settings">
     <connections>
@@ -75,7 +77,7 @@
           <url-type value="DATABASE" />
           <host value="localhost" />
           <port value="5432" />
-          <database value="postgres" />
+          <database value="poc" />
           <os-authentication value="true" />
           <empty-password value="false" />
           <user value="" />
diff --git a/.idea/libraries/Gradle__org_postgresql_postgresql_42_1_1_jre8.xml b/.idea/libraries/Gradle__org_postgresql_postgresql_42_1_1_jre8.xml
new file mode 100644
index 0000000..27448b5
--- /dev/null
+++ b/.idea/libraries/Gradle__org_postgresql_postgresql_42_1_1_jre8.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="Gradle: org.postgresql:postgresql:42.1.1.jre8">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/Could not find org.postgresql:postgresql:42.1.1.jre8." />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/.idea/modules/poc-java_main.iml b/.idea/modules/poc-java_main.iml
index 09dd5d9..c8e9149 100644
--- a/.idea/modules/poc-java_main.iml
+++ b/.idea/modules/poc-java_main.iml
@@ -9,16 +9,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Gradle: io.mraa:mraa:1.5.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.postgresql:postgresql:42.1.1.jre8" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver:3.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: de.vandermeer:asciitable:0.2.5" level="project" />
+    <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver-core:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: :IOBoard-0.1:" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.10" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:bson:3.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver-core:3.4.2" level="project" />
+    <orderEntry type="library" name="Gradle: de.vandermeer:asciitable:0.2.5" level="project" />
     <orderEntry type="library" name="Gradle: de.vandermeer:asciilist:0.0.3" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
+    <orderEntry type="library" name="Gradle: io.mraa:mraa:1.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/.idea/modules/poc-java_test.iml b/.idea/modules/poc-java_test.iml
index c619f46..45bcf58 100644
--- a/.idea/modules/poc-java_test.iml
+++ b/.idea/modules/poc-java_test.iml
@@ -9,17 +9,17 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="poc-java_main" />
-    <orderEntry type="library" name="Gradle: io.mraa:mraa:1.5.1" level="project" />
-    <orderEntry type="library" name="Gradle: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" name="Gradle: org.postgresql:postgresql:42.1.1.jre8" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver:3.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: de.vandermeer:asciitable:0.2.5" level="project" />
+    <orderEntry type="library" name="Gradle: de.vandermeer:asciilist:0.0.3" level="project" />
     <orderEntry type="library" name="Gradle: :IOBoard-0.1:" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:bson:3.4.2" level="project" />
     <orderEntry type="library" name="Gradle: org.mongodb:mongodb-driver-core:3.4.2" level="project" />
-    <orderEntry type="library" name="Gradle: de.vandermeer:asciilist:0.0.3" level="project" />
+    <orderEntry type="library" name="Gradle: de.vandermeer:asciitable:0.2.5" level="project" />
     <orderEntry type="library" name="Gradle: org.apache.commons:commons-lang3:3.4" level="project" />
     <orderEntry type="library" name="Gradle: junit:junit:4.10" level="project" />
+    <orderEntry type="library" name="Gradle: io.mraa:mraa:1.5.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
     <orderEntry type="library" name="Gradle: org.hamcrest:hamcrest-core:1.1" level="project" />
   </component>
   <component name="TestModuleProperties" production-module="poc-java_main" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 845f9ef..c564c07 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,14 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/libs/IOBoard-RPi-0.1.jar" afterPath="$PROJECT_DIR$/libs/IOBoard-RPi-0.1.jar" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dbnavigator.xml" afterPath="$PROJECT_DIR$/.idea/dbnavigator.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules/poc-java_main.iml" afterPath="$PROJECT_DIR$/.idea/modules/poc-java_main.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules/poc-java_test.iml" afterPath="$PROJECT_DIR$/.idea/modules/poc-java_test.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.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/Well.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/db_setup.sql" afterPath="$PROJECT_DIR$/db_setup.sql" />
+      <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/Measurement.java" afterPath="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -24,26 +25,6 @@
   <component name="CreatePatchCommitExecutor">
     <option name="PATCH_PATH" value="" />
   </component>
-  <component name="DockManager">
-    <window id="1">
-      <content type="file-editors">
-        <state>
-          <leaf>
-            <file leaf-file-name="Database.java" pinned="false" current-in-tab="true">
-              <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="1073">
-                    <caret line="351" column="0" lean-forward="true" selection-start-line="351" selection-start-column="0" selection-end-line="351" selection-end-column="0" />
-                    <folding />
-                  </state>
-                </provider>
-              </entry>
-            </file>
-          </leaf>
-        </state>
-      </content>
-    </window>
-  </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="ExternalProjectsData">
     <projectState path="$PROJECT_DIR$">
@@ -132,196 +113,47 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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">
+      <file leaf-file-name="Database.java" pinned="false" current-in-tab="true">
+        <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="120">
-              <caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="Dockerfile" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Dockerfile">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="150">
-              <caret line="10" column="9" lean-forward="false" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="App.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/App.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+            <state relative-caret-position="-2696">
+              <caret line="241" column="0" lean-forward="true" selection-start-line="241" selection-start-column="0" selection-end-line="241" selection-end-column="0" />
               <folding>
-                <element signature="e#124#125#0" expanded="false" />
-                <element signature="e#176#177#0" expanded="false" />
+                <element signature="imports" expanded="true" />
+                <marker date="1498655799000" expanded="true" signature="1880:1916" ph=" SELECT statement (CARDS)" />
+                <marker date="1498655799000" expanded="true" signature="2425:2547" ph=" INSERT statement (CARDS)" />
+                <marker date="1498655799000" expanded="true" signature="3438:3474" ph=" SELECT statement (CARDS)" />
+                <marker date="1498655799000" expanded="true" signature="3970:4024" ph=" INSERT statement (MEASUREMENTS_NUM)" />
+                <marker date="1498655799000" expanded="true" signature="4388:4442" ph=" SELECT statement (MEASUREMENTS_NUM)" />
+                <marker date="1498655799000" expanded="true" signature="4919:5016" ph=" SELECT statement (MEASUREMENTS_NUM, MEASURMENTS_NUM)" />
+                <marker date="1498655799000" expanded="true" signature="5621:5743" ph=" INSERT statement (DAILY_TOTALS)" />
+                <marker date="1498655799000" expanded="true" signature="6373:6411" ph=" SELECT statement (MEASUREMENTS_NUM)" />
+                <marker date="1498655799000" expanded="true" signature="6373:6423" ph=" SELECT statement (DAILY_TOTALS)" />
+                <marker date="1498655799000" expanded="true" signature="6890:7103" ph=" INSERT statement (WELL_TESTS)" />
+                <marker date="1498655799000" expanded="true" signature="7961:7992" ph=" SELECT statement (DAILY_TOTALS)" />
+                <marker date="1498655799000" expanded="true" signature="7961:8002" ph=" SELECT statement (WELL_TESTS)" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="rpi_startup.sh" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/rpi_startup.sh">
+      <file leaf-file-name="Measurement.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="0">
-              <caret line="0" column="76" lean-forward="false" selection-start-line="0" selection-start-column="76" selection-end-line="0" selection-end-column="76" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <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="23190">
-              <caret line="1685" column="0" lean-forward="false" selection-start-line="1685" selection-start-column="0" selection-end-line="1685" selection-end-column="0" />
+            <state relative-caret-position="719">
+              <caret line="157" column="26" lean-forward="false" selection-start-line="157" selection-start-column="26" selection-end-line="157" selection-end-column="26" />
               <folding>
-                <element signature="e#20646#20647#0" expanded="false" />
-                <element signature="e#20671#20672#0" expanded="false" />
-                <element signature="e#20707#20708#0" expanded="false" />
-                <element signature="e#20735#20736#0" expanded="false" />
-                <element signature="e#20780#20781#0" expanded="false" />
-                <element signature="e#20821#20822#0" expanded="false" />
-                <element signature="e#20889#20890#0" expanded="false" />
-                <element signature="e#20949#20950#0" expanded="false" />
-                <element signature="e#20989#20990#0" expanded="false" />
-                <element signature="e#21025#21026#0" expanded="false" />
-                <element signature="e#21083#21084#0" expanded="false" />
-                <element signature="e#21133#21134#0" expanded="false" />
-                <element signature="e#21170#21171#0" expanded="false" />
-                <element signature="e#21203#21204#0" expanded="false" />
-                <element signature="e#21255#21256#0" expanded="false" />
-                <element signature="e#21299#21300#0" expanded="false" />
-                <element signature="e#21332#21333#0" expanded="false" />
-                <element signature="e#21364#21365#0" expanded="false" />
-                <element signature="e#21411#21412#0" expanded="false" />
-                <element signature="e#21453#21454#0" expanded="false" />
-                <element signature="e#21497#21498#0" expanded="false" />
-                <element signature="e#21537#21538#0" expanded="false" />
-                <element signature="e#21603#21604#0" expanded="false" />
-                <element signature="e#21661#21662#0" expanded="false" />
-                <element signature="e#21700#21701#0" expanded="false" />
-                <element signature="e#21735#21736#0" expanded="false" />
-                <element signature="e#21931#21932#0" expanded="false" />
-                <element signature="e#21962#21963#0" expanded="false" />
-                <element signature="e#22189#22190#0" expanded="false" />
-                <element signature="e#22220#22221#0" expanded="false" />
-                <element signature="e#22461#22462#0" expanded="false" />
-                <element signature="e#22490#22491#0" expanded="false" />
-                <element signature="e#22606#22607#0" expanded="false" />
-                <element signature="e#22651#22652#0" expanded="false" />
-                <element signature="e#22775#22776#0" expanded="false" />
-                <element signature="e#22824#22825#0" expanded="false" />
-                <element signature="e#23416#23417#0" expanded="false" />
-                <element signature="e#23455#23456#0" expanded="false" />
-                <element signature="e#23519#23520#0" expanded="false" />
-                <element signature="e#23575#23576#0" expanded="false" />
-                <element signature="e#23615#23616#0" expanded="false" />
-                <element signature="e#23651#23652#0" expanded="false" />
-                <element signature="e#23686#23687#0" expanded="false" />
-                <element signature="e#23717#23718#0" expanded="false" />
-                <element signature="e#23768#23769#0" expanded="false" />
-                <element signature="e#23815#23816#0" expanded="false" />
-                <element signature="e#23858#23859#0" expanded="false" />
-                <element signature="e#23897#23898#0" expanded="false" />
-                <element signature="e#23961#23962#0" expanded="false" />
-                <element signature="e#24017#24018#0" expanded="false" />
-                <element signature="e#24065#24066#0" expanded="false" />
-                <element signature="e#24105#24106#0" expanded="false" />
-                <element signature="e#24140#24141#0" expanded="false" />
-                <element signature="e#24171#24172#0" expanded="false" />
-                <element signature="e#24210#24211#0" expanded="false" />
-                <element signature="e#24245#24246#0" expanded="false" />
-                <element signature="e#24278#24279#0" expanded="false" />
-                <element signature="e#24310#24311#0" expanded="false" />
-                <element signature="e#24912#24913#0" expanded="false" />
-                <element signature="e#24942#24943#0" expanded="false" />
-                <element signature="e#25937#25938#0" expanded="false" />
-                <element signature="e#25975#25976#0" expanded="false" />
-                <element signature="e#26024#26025#0" expanded="false" />
-                <element signature="e#26069#26070#0" expanded="false" />
-                <element signature="e#26114#26115#0" expanded="false" />
-                <element signature="e#26155#26156#0" expanded="false" />
-                <element signature="e#26205#26206#0" expanded="false" />
-                <element signature="e#26251#26252#0" expanded="false" />
-                <element signature="e#26297#26298#0" expanded="false" />
-                <element signature="e#26339#26340#0" expanded="false" />
-                <element signature="e#26378#26379#0" expanded="false" />
-                <element signature="e#26415#26416#0" expanded="false" />
-                <element signature="e#26473#26474#0" expanded="false" />
-                <element signature="e#26525#26526#0" expanded="false" />
-                <element signature="e#26567#26568#0" expanded="false" />
-                <element signature="e#26607#26608#0" expanded="false" />
-                <element signature="e#26644#26645#0" expanded="false" />
-                <element signature="e#26679#26680#0" expanded="false" />
-                <element signature="e#26719#26720#0" expanded="false" />
-                <element signature="e#26757#26758#0" expanded="false" />
-                <element signature="e#26790#26791#0" expanded="false" />
-                <element signature="e#26822#26823#0" expanded="false" />
-                <element signature="e#26880#26881#0" expanded="false" />
-                <element signature="e#26930#26931#0" expanded="false" />
-                <element signature="e#26992#26993#0" expanded="false" />
-                <element signature="e#27046#27047#0" expanded="false" />
-                <element signature="e#27104#27105#0" expanded="false" />
-                <element signature="e#27154#27155#0" expanded="false" />
-                <element signature="e#27194#27195#0" expanded="false" />
-                <element signature="e#27230#27231#0" expanded="false" />
-                <element signature="e#27272#27273#0" expanded="false" />
-                <element signature="e#27310#27311#0" expanded="false" />
-                <element signature="e#27350#27351#0" expanded="false" />
-                <element signature="e#27386#27387#0" expanded="false" />
-                <element signature="e#27420#27421#0" expanded="false" />
-                <element signature="e#27450#27451#0" expanded="false" />
-                <element signature="e#27496#27497#0" expanded="false" />
-                <element signature="e#27534#27535#0" expanded="false" />
-                <element signature="e#27575#27576#0" expanded="false" />
-                <element signature="e#27615#27616#0" expanded="false" />
-                <element signature="e#27662#27663#0" expanded="false" />
-                <element signature="e#27698#27699#0" expanded="false" />
-                <element signature="e#27742#27743#0" expanded="false" />
-                <element signature="e#27784#27785#0" expanded="false" />
-                <element signature="e#27837#27838#0" expanded="false" />
-                <element signature="e#27886#27887#0" expanded="false" />
-                <element signature="e#28092#28093#0" expanded="false" />
-                <element signature="e#28137#28138#0" expanded="false" />
-                <element signature="e#28333#28334#0" expanded="false" />
-                <element signature="e#28386#28387#0" expanded="false" />
-                <element signature="e#28807#28808#0" expanded="false" />
-                <element signature="e#28853#28854#0" expanded="false" />
-                <element signature="e#29047#29048#0" expanded="false" />
-                <element signature="e#29093#29094#0" expanded="false" />
-                <element signature="e#31346#31347#0" expanded="false" />
-                <element signature="e#31381#31382#0" expanded="false" />
+                <element signature="e#4735#4736#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="IOControl.java" pinned="false" current-in-tab="false">
-        <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="780">
-              <caret line="58" column="29" lean-forward="false" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
-              <folding>
-                <element signature="e#842#843#0" expanded="false" />
-                <element signature="e#891#892#0" expanded="false" />
-                <element signature="e#921#922#0" expanded="false" />
-                <element signature="e#969#970#0" expanded="false" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file leaf-file-name="db_setup.sql" pinned="false" current-in-tab="true">
+      <file leaf-file-name="db_setup.sql" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/db_setup.sql">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1215">
-              <caret line="81" column="30" lean-forward="true" selection-start-line="81" selection-start-column="30" selection-end-line="81" selection-end-column="30" />
+            <state relative-caret-position="-81">
+              <caret line="19" column="36" lean-forward="false" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
               <folding />
             </state>
           </provider>
@@ -555,8 +387,8 @@
     </option>
     <option name="modificationStamps">
       <map>
-        <entry key="$PROJECT_DIR$" value="5981402855000" />
-        <entry key="$PROJECT_DIR$/build.gradle" value="1539354392" />
+        <entry key="$PROJECT_DIR$" value="5981569463000" />
+        <entry key="$PROJECT_DIR$/build.gradle" value="3316346151" />
       </map>
     </option>
     <option name="projectBuildClasspath">
@@ -775,9 +607,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/WebServer.java" />
         <option value="$PROJECT_DIR$/startup.sh" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Card.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
-        <option value="$PROJECT_DIR$/build.gradle" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.java" />
         <option value="$PROJECT_DIR$/rpi_startup.sh" />
@@ -785,9 +614,19 @@
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
         <option value="$PROJECT_DIR$/db_setup.sql" />
+        <option value="$PROJECT_DIR$/build.gradle" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
       </list>
     </option>
   </component>
+  <component name="LogFilters">
+    <option name="FILTER_ERRORS" value="false" />
+    <option name="FILTER_WARNINGS" value="false" />
+    <option name="FILTER_INFO" value="true" />
+    <option name="FILTER_DEBUG" value="true" />
+    <option name="CUSTOM_FILTER" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="importingSettings">
       <MavenImportingSettings>
@@ -819,8 +658,6 @@
     </navigator>
     <panes>
       <pane id="Scope" />
-      <pane id="Scratches" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -867,7 +704,19 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="libs" />
+              <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>
@@ -880,24 +729,6 @@
               <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="build" />
-              <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="build" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
             <PATH_ELEMENT>
               <option name="myItemId" value="libs" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
@@ -905,6 +736,8 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -914,7 +747,6 @@
     <property name="project.structure.side.proportion" value="0.2" />
     <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" />
-    <property name="FullScreen" value="true" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -1226,29 +1058,29 @@
     <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="Nl-Palette" 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="2" side_tool="false" content_ui="tabs" />
-      <window_info id="DB Execution Console" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29411766" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Execution Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29411766" 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.32847533" sideWeight="0.50238097" 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="Properties" 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="6" 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="MaxCompute Job" 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="-1" side_tool="false" content_ui="tabs" />
-      <window_info id="MaxCompute Job Explorer" 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="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="MaxCompute Job" 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" />
+      <window_info id="MaxCompute Job Explorer" 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="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" />
       <window_info id="UI 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="5" side_tool="false" content_ui="tabs" />
+      <window_info id="MaxCompute Project Explorer" 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="Debug" 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="4" side_tool="false" content_ui="tabs" />
-      <window_info id="MaxCompute Project Explorer" 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="-1" 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" />
-      <window_info id="DB Browser" 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="-1" side_tool="false" content_ui="tabs" />
+      <window_info id="DB Browser" 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="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="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" />
+      <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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19166666" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="MaxCompute Console" 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="-1" 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.22619048" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="MaxCompute Console" 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" />
       <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="Theme Preview" 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="8" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" 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="6" side_tool="true" content_ui="tabs" />
@@ -1287,122 +1119,7 @@
         <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#20646#20647#0" expanded="false" />
-            <element signature="e#20671#20672#0" expanded="false" />
-            <element signature="e#20707#20708#0" expanded="false" />
-            <element signature="e#20735#20736#0" expanded="false" />
-            <element signature="e#20780#20781#0" expanded="false" />
-            <element signature="e#20821#20822#0" expanded="false" />
-            <element signature="e#20889#20890#0" expanded="false" />
-            <element signature="e#20949#20950#0" expanded="false" />
-            <element signature="e#20989#20990#0" expanded="false" />
-            <element signature="e#21025#21026#0" expanded="false" />
-            <element signature="e#21083#21084#0" expanded="false" />
-            <element signature="e#21133#21134#0" expanded="false" />
-            <element signature="e#21170#21171#0" expanded="false" />
-            <element signature="e#21203#21204#0" expanded="false" />
-            <element signature="e#21255#21256#0" expanded="false" />
-            <element signature="e#21299#21300#0" expanded="false" />
-            <element signature="e#21332#21333#0" expanded="false" />
-            <element signature="e#21364#21365#0" expanded="false" />
-            <element signature="e#21411#21412#0" expanded="false" />
-            <element signature="e#21453#21454#0" expanded="false" />
-            <element signature="e#21497#21498#0" expanded="false" />
-            <element signature="e#21537#21538#0" expanded="false" />
-            <element signature="e#21603#21604#0" expanded="false" />
-            <element signature="e#21661#21662#0" expanded="false" />
-            <element signature="e#21700#21701#0" expanded="false" />
-            <element signature="e#21735#21736#0" expanded="false" />
-            <element signature="e#21931#21932#0" expanded="false" />
-            <element signature="e#21962#21963#0" expanded="false" />
-            <element signature="e#22189#22190#0" expanded="false" />
-            <element signature="e#22220#22221#0" expanded="false" />
-            <element signature="e#22461#22462#0" expanded="false" />
-            <element signature="e#22490#22491#0" expanded="false" />
-            <element signature="e#22606#22607#0" expanded="false" />
-            <element signature="e#22651#22652#0" expanded="false" />
-            <element signature="e#22775#22776#0" expanded="false" />
-            <element signature="e#22824#22825#0" expanded="false" />
-            <element signature="e#23416#23417#0" expanded="false" />
-            <element signature="e#23455#23456#0" expanded="false" />
-            <element signature="e#23519#23520#0" expanded="false" />
-            <element signature="e#23575#23576#0" expanded="false" />
-            <element signature="e#23615#23616#0" expanded="false" />
-            <element signature="e#23651#23652#0" expanded="false" />
-            <element signature="e#23686#23687#0" expanded="false" />
-            <element signature="e#23717#23718#0" expanded="false" />
-            <element signature="e#23768#23769#0" expanded="false" />
-            <element signature="e#23815#23816#0" expanded="false" />
-            <element signature="e#23858#23859#0" expanded="false" />
-            <element signature="e#23897#23898#0" expanded="false" />
-            <element signature="e#23961#23962#0" expanded="false" />
-            <element signature="e#24017#24018#0" expanded="false" />
-            <element signature="e#24065#24066#0" expanded="false" />
-            <element signature="e#24105#24106#0" expanded="false" />
-            <element signature="e#24140#24141#0" expanded="false" />
-            <element signature="e#24171#24172#0" expanded="false" />
-            <element signature="e#24210#24211#0" expanded="false" />
-            <element signature="e#24245#24246#0" expanded="false" />
-            <element signature="e#24278#24279#0" expanded="false" />
-            <element signature="e#24310#24311#0" expanded="false" />
-            <element signature="e#24912#24913#0" expanded="false" />
-            <element signature="e#24942#24943#0" expanded="false" />
-            <element signature="e#25937#25938#0" expanded="false" />
-            <element signature="e#25975#25976#0" expanded="false" />
-            <element signature="e#26024#26025#0" expanded="false" />
-            <element signature="e#26069#26070#0" expanded="false" />
-            <element signature="e#26114#26115#0" expanded="false" />
-            <element signature="e#26155#26156#0" expanded="false" />
-            <element signature="e#26205#26206#0" expanded="false" />
-            <element signature="e#26251#26252#0" expanded="false" />
-            <element signature="e#26297#26298#0" expanded="false" />
-            <element signature="e#26339#26340#0" expanded="false" />
-            <element signature="e#26378#26379#0" expanded="false" />
-            <element signature="e#26415#26416#0" expanded="false" />
-            <element signature="e#26473#26474#0" expanded="false" />
-            <element signature="e#26525#26526#0" expanded="false" />
-            <element signature="e#26567#26568#0" expanded="false" />
-            <element signature="e#26607#26608#0" expanded="false" />
-            <element signature="e#26644#26645#0" expanded="false" />
-            <element signature="e#26679#26680#0" expanded="false" />
-            <element signature="e#26719#26720#0" expanded="false" />
-            <element signature="e#26757#26758#0" expanded="false" />
-            <element signature="e#26790#26791#0" expanded="false" />
-            <element signature="e#26822#26823#0" expanded="false" />
-            <element signature="e#26880#26881#0" expanded="false" />
-            <element signature="e#26930#26931#0" expanded="false" />
-            <element signature="e#26992#26993#0" expanded="false" />
-            <element signature="e#27046#27047#0" expanded="false" />
-            <element signature="e#27104#27105#0" expanded="false" />
-            <element signature="e#27154#27155#0" expanded="false" />
-            <element signature="e#27194#27195#0" expanded="false" />
-            <element signature="e#27230#27231#0" expanded="false" />
-            <element signature="e#27272#27273#0" expanded="false" />
-            <element signature="e#27310#27311#0" expanded="false" />
-            <element signature="e#27350#27351#0" expanded="false" />
-            <element signature="e#27386#27387#0" expanded="false" />
-            <element signature="e#27420#27421#0" expanded="false" />
-            <element signature="e#27450#27451#0" expanded="false" />
-            <element signature="e#27496#27497#0" expanded="false" />
-            <element signature="e#27534#27535#0" expanded="false" />
-            <element signature="e#27575#27576#0" expanded="false" />
-            <element signature="e#27615#27616#0" expanded="false" />
-            <element signature="e#27662#27663#0" expanded="false" />
-            <element signature="e#27698#27699#0" expanded="false" />
-            <element signature="e#27742#27743#0" expanded="false" />
-            <element signature="e#27784#27785#0" expanded="false" />
-            <element signature="e#27837#27838#0" expanded="false" />
-            <element signature="e#27886#27887#0" expanded="false" />
-            <element signature="e#28092#28093#0" expanded="false" />
-            <element signature="e#28137#28138#0" expanded="false" />
-            <element signature="e#28333#28334#0" expanded="false" />
-            <element signature="e#28386#28387#0" expanded="false" />
-            <element signature="e#28807#28808#0" expanded="false" />
-            <element signature="e#28853#28854#0" expanded="false" />
-            <element signature="e#29047#29048#0" expanded="false" />
-            <element signature="e#29093#29094#0" expanded="false" />
-            <element signature="e#31346#31347#0" expanded="false" />
-            <element signature="e#31381#31382#0" expanded="false" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
@@ -1411,7 +1128,21 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="810">
           <caret line="72" column="28" lean-forward="false" selection-start-line="72" selection-start-column="28" selection-end-line="72" selection-end-column="28" />
-          <folding />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <marker date="1498655799000" expanded="true" signature="1880:1916" ph=" SELECT statement (CARDS)" />
+            <marker date="1498655799000" expanded="true" signature="2425:2547" ph=" INSERT statement (CARDS)" />
+            <marker date="1498655799000" expanded="true" signature="3438:3474" ph=" SELECT statement (CARDS)" />
+            <marker date="1498655799000" expanded="true" signature="3970:4024" ph=" INSERT statement (MEASUREMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="4388:4442" ph=" SELECT statement (MEASUREMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="4919:5016" ph=" SELECT statement (MEASUREMENTS_NUM, MEASURMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="5621:5743" ph=" INSERT statement (DAILY_TOTALS)" />
+            <marker date="1498655799000" expanded="true" signature="6373:6411" ph=" SELECT statement (MEASUREMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="6373:6423" ph=" SELECT statement (DAILY_TOTALS)" />
+            <marker date="1498655799000" expanded="true" signature="6890:7103" ph=" INSERT statement (WELL_TESTS)" />
+            <marker date="1498655799000" expanded="true" signature="7961:7992" ph=" SELECT statement (DAILY_TOTALS)" />
+            <marker date="1498655799000" expanded="true" signature="7961:8002" ph=" SELECT statement (WELL_TESTS)" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -1578,52 +1309,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="855">
-          <caret line="64" column="69" lean-forward="false" selection-start-line="64" selection-start-column="69" selection-end-line="64" selection-end-column="69" />
-          <folding>
-            <element signature="imports" expanded="false" />
-            <element signature="e#3359#3360#0" expanded="false" />
-            <element signature="e#3394#3395#0" expanded="false" />
-            <element signature="e#3430#3431#0" expanded="false" />
-            <element signature="e#3462#3463#0" expanded="false" />
-            <element signature="e#3496#3497#0" expanded="false" />
-            <element signature="e#3526#3527#0" expanded="false" />
-            <element signature="e#3558#3559#0" expanded="false" />
-            <element signature="e#3586#3587#0" expanded="false" />
-            <element signature="e#3626#3627#0" expanded="false" />
-            <element signature="e#3664#3665#0" expanded="false" />
-            <element signature="e#3698#3699#0" expanded="false" />
-            <element signature="e#3728#3729#0" expanded="false" />
-            <element signature="e#3763#3764#0" expanded="false" />
-            <element signature="e#3794#3795#0" expanded="false" />
-            <element signature="e#3829#3830#0" expanded="false" />
-            <element signature="e#3860#3861#0" expanded="false" />
-            <element signature="e#3896#3897#0" expanded="false" />
-            <element signature="e#3928#3929#0" expanded="false" />
-            <element signature="e#3978#3979#0" expanded="false" />
-            <element signature="e#4020#4021#0" expanded="false" />
-            <element signature="e#4058#4059#0" expanded="false" />
-            <element signature="e#4094#4095#0" expanded="false" />
-            <element signature="e#4150#4151#0" expanded="false" />
-            <element signature="e#4200#4201#0" expanded="false" />
-            <element signature="e#4232#4233#0" expanded="false" />
-            <element signature="e#4260#4261#0" expanded="false" />
-            <element signature="e#4302#4303#0" expanded="false" />
-            <element signature="e#4336#4337#0" expanded="false" />
-            <element signature="e#4371#4372#0" expanded="false" />
-            <element signature="e#4402#4403#0" expanded="false" />
-            <element signature="e#4451#4452#0" expanded="false" />
-            <element signature="e#4491#4492#0" expanded="false" />
-            <element signature="e#4528#4529#0" expanded="false" />
-            <element signature="e#4561#4562#0" expanded="false" />
-            <element signature="e#4614#4615#0" expanded="false" />
-            <element signature="e#4658#4659#0" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/settings.gradle">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -1632,14 +1317,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/build.gradle">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="390">
-          <caret line="26" column="31" lean-forward="false" selection-start-line="26" selection-start-column="31" selection-end-line="26" selection-end-column="31" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/AnalogIn.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="960">
@@ -1654,19 +1331,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/rpi_startup.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="76" lean-forward="false" selection-start-line="0" selection-start-column="76" selection-end-line="0" selection-end-column="76" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Dockerfile">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="150">
           <caret line="10" column="9" lean-forward="false" selection-start-line="10" selection-start-column="9" selection-end-line="10" selection-end-column="9" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1674,148 +1342,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="6" column="13" lean-forward="false" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
-          <folding>
-            <element signature="e#124#125#0" expanded="false" />
-            <element signature="e#176#177#0" expanded="false" />
-          </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="780">
-          <caret line="58" column="29" lean-forward="false" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
-          <folding>
-            <element signature="e#842#843#0" expanded="false" />
-            <element signature="e#891#892#0" expanded="false" />
-            <element signature="e#921#922#0" expanded="false" />
-            <element signature="e#969#970#0" expanded="false" />
-          </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="23190">
-          <caret line="1685" column="0" lean-forward="false" selection-start-line="1685" selection-start-column="0" selection-end-line="1685" selection-end-column="0" />
-          <folding>
-            <element signature="e#20646#20647#0" expanded="false" />
-            <element signature="e#20671#20672#0" expanded="false" />
-            <element signature="e#20707#20708#0" expanded="false" />
-            <element signature="e#20735#20736#0" expanded="false" />
-            <element signature="e#20780#20781#0" expanded="false" />
-            <element signature="e#20821#20822#0" expanded="false" />
-            <element signature="e#20889#20890#0" expanded="false" />
-            <element signature="e#20949#20950#0" expanded="false" />
-            <element signature="e#20989#20990#0" expanded="false" />
-            <element signature="e#21025#21026#0" expanded="false" />
-            <element signature="e#21083#21084#0" expanded="false" />
-            <element signature="e#21133#21134#0" expanded="false" />
-            <element signature="e#21170#21171#0" expanded="false" />
-            <element signature="e#21203#21204#0" expanded="false" />
-            <element signature="e#21255#21256#0" expanded="false" />
-            <element signature="e#21299#21300#0" expanded="false" />
-            <element signature="e#21332#21333#0" expanded="false" />
-            <element signature="e#21364#21365#0" expanded="false" />
-            <element signature="e#21411#21412#0" expanded="false" />
-            <element signature="e#21453#21454#0" expanded="false" />
-            <element signature="e#21497#21498#0" expanded="false" />
-            <element signature="e#21537#21538#0" expanded="false" />
-            <element signature="e#21603#21604#0" expanded="false" />
-            <element signature="e#21661#21662#0" expanded="false" />
-            <element signature="e#21700#21701#0" expanded="false" />
-            <element signature="e#21735#21736#0" expanded="false" />
-            <element signature="e#21931#21932#0" expanded="false" />
-            <element signature="e#21962#21963#0" expanded="false" />
-            <element signature="e#22189#22190#0" expanded="false" />
-            <element signature="e#22220#22221#0" expanded="false" />
-            <element signature="e#22461#22462#0" expanded="false" />
-            <element signature="e#22490#22491#0" expanded="false" />
-            <element signature="e#22606#22607#0" expanded="false" />
-            <element signature="e#22651#22652#0" expanded="false" />
-            <element signature="e#22775#22776#0" expanded="false" />
-            <element signature="e#22824#22825#0" expanded="false" />
-            <element signature="e#23416#23417#0" expanded="false" />
-            <element signature="e#23455#23456#0" expanded="false" />
-            <element signature="e#23519#23520#0" expanded="false" />
-            <element signature="e#23575#23576#0" expanded="false" />
-            <element signature="e#23615#23616#0" expanded="false" />
-            <element signature="e#23651#23652#0" expanded="false" />
-            <element signature="e#23686#23687#0" expanded="false" />
-            <element signature="e#23717#23718#0" expanded="false" />
-            <element signature="e#23768#23769#0" expanded="false" />
-            <element signature="e#23815#23816#0" expanded="false" />
-            <element signature="e#23858#23859#0" expanded="false" />
-            <element signature="e#23897#23898#0" expanded="false" />
-            <element signature="e#23961#23962#0" expanded="false" />
-            <element signature="e#24017#24018#0" expanded="false" />
-            <element signature="e#24065#24066#0" expanded="false" />
-            <element signature="e#24105#24106#0" expanded="false" />
-            <element signature="e#24140#24141#0" expanded="false" />
-            <element signature="e#24171#24172#0" expanded="false" />
-            <element signature="e#24210#24211#0" expanded="false" />
-            <element signature="e#24245#24246#0" expanded="false" />
-            <element signature="e#24278#24279#0" expanded="false" />
-            <element signature="e#24310#24311#0" expanded="false" />
-            <element signature="e#24912#24913#0" expanded="false" />
-            <element signature="e#24942#24943#0" expanded="false" />
-            <element signature="e#25937#25938#0" expanded="false" />
-            <element signature="e#25975#25976#0" expanded="false" />
-            <element signature="e#26024#26025#0" expanded="false" />
-            <element signature="e#26069#26070#0" expanded="false" />
-            <element signature="e#26114#26115#0" expanded="false" />
-            <element signature="e#26155#26156#0" expanded="false" />
-            <element signature="e#26205#26206#0" expanded="false" />
-            <element signature="e#26251#26252#0" expanded="false" />
-            <element signature="e#26297#26298#0" expanded="false" />
-            <element signature="e#26339#26340#0" expanded="false" />
-            <element signature="e#26378#26379#0" expanded="false" />
-            <element signature="e#26415#26416#0" expanded="false" />
-            <element signature="e#26473#26474#0" expanded="false" />
-            <element signature="e#26525#26526#0" expanded="false" />
-            <element signature="e#26567#26568#0" expanded="false" />
-            <element signature="e#26607#26608#0" expanded="false" />
-            <element signature="e#26644#26645#0" expanded="false" />
-            <element signature="e#26679#26680#0" expanded="false" />
-            <element signature="e#26719#26720#0" expanded="false" />
-            <element signature="e#26757#26758#0" expanded="false" />
-            <element signature="e#26790#26791#0" expanded="false" />
-            <element signature="e#26822#26823#0" expanded="false" />
-            <element signature="e#26880#26881#0" expanded="false" />
-            <element signature="e#26930#26931#0" expanded="false" />
-            <element signature="e#26992#26993#0" expanded="false" />
-            <element signature="e#27046#27047#0" expanded="false" />
-            <element signature="e#27104#27105#0" expanded="false" />
-            <element signature="e#27154#27155#0" expanded="false" />
-            <element signature="e#27194#27195#0" expanded="false" />
-            <element signature="e#27230#27231#0" expanded="false" />
-            <element signature="e#27272#27273#0" expanded="false" />
-            <element signature="e#27310#27311#0" expanded="false" />
-            <element signature="e#27350#27351#0" expanded="false" />
-            <element signature="e#27386#27387#0" expanded="false" />
-            <element signature="e#27420#27421#0" expanded="false" />
-            <element signature="e#27450#27451#0" expanded="false" />
-            <element signature="e#27496#27497#0" expanded="false" />
-            <element signature="e#27534#27535#0" expanded="false" />
-            <element signature="e#27575#27576#0" expanded="false" />
-            <element signature="e#27615#27616#0" expanded="false" />
-            <element signature="e#27662#27663#0" expanded="false" />
-            <element signature="e#27698#27699#0" expanded="false" />
-            <element signature="e#27742#27743#0" expanded="false" />
-            <element signature="e#27784#27785#0" expanded="false" />
-            <element signature="e#27837#27838#0" expanded="false" />
-            <element signature="e#27886#27887#0" expanded="false" />
-            <element signature="e#28092#28093#0" expanded="false" />
-            <element signature="e#28137#28138#0" expanded="false" />
-            <element signature="e#28333#28334#0" expanded="false" />
-            <element signature="e#28386#28387#0" expanded="false" />
-            <element signature="e#28807#28808#0" expanded="false" />
-            <element signature="e#28853#28854#0" expanded="false" />
-            <element signature="e#29047#29048#0" expanded="false" />
-            <element signature="e#29093#29094#0" expanded="false" />
-            <element signature="e#31346#31347#0" expanded="false" />
-            <element signature="e#31381#31382#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1823,23 +1349,81 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
           <caret line="8" column="3" lean-forward="false" selection-start-line="8" selection-start-column="3" selection-end-line="8" selection-end-column="3" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build.gradle">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="405">
+          <caret line="27" column="51" lean-forward="false" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/rpi_startup.sh">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="76" lean-forward="false" selection-start-line="0" selection-start-column="76" selection-end-line="0" selection-end-column="76" />
+        </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="696">
+          <caret line="1685" column="0" lean-forward="false" selection-start-line="1685" selection-start-column="0" selection-end-line="1685" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </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="810">
+          <caret line="58" column="29" lean-forward="false" selection-start-line="58" selection-start-column="29" selection-end-line="58" selection-end-column="29" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/db_setup.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1215">
-          <caret line="81" column="30" lean-forward="true" selection-start-line="81" selection-start-column="30" selection-end-line="81" selection-end-column="30" />
+        <state relative-caret-position="-81">
+          <caret line="19" column="36" lean-forward="false" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/henrypump/poc/Measurement.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="719">
+          <caret line="157" column="26" lean-forward="false" selection-start-line="157" selection-start-column="26" selection-end-line="157" selection-end-column="26" />
+          <folding>
+            <element signature="e#4735#4736#0" expanded="true" />
+          </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="1073">
-          <caret line="351" column="0" lean-forward="true" selection-start-line="351" selection-start-column="0" selection-end-line="351" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="-2696">
+          <caret line="241" column="0" lean-forward="true" selection-start-line="241" selection-start-column="0" selection-end-line="241" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <marker date="1498655799000" expanded="true" signature="1880:1916" ph=" SELECT statement (CARDS)" />
+            <marker date="1498655799000" expanded="true" signature="2425:2547" ph=" INSERT statement (CARDS)" />
+            <marker date="1498655799000" expanded="true" signature="3438:3474" ph=" SELECT statement (CARDS)" />
+            <marker date="1498655799000" expanded="true" signature="3970:4024" ph=" INSERT statement (MEASUREMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="4388:4442" ph=" SELECT statement (MEASUREMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="4919:5016" ph=" SELECT statement (MEASUREMENTS_NUM, MEASURMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="5621:5743" ph=" INSERT statement (DAILY_TOTALS)" />
+            <marker date="1498655799000" expanded="true" signature="6373:6411" ph=" SELECT statement (MEASUREMENTS_NUM)" />
+            <marker date="1498655799000" expanded="true" signature="6373:6423" ph=" SELECT statement (DAILY_TOTALS)" />
+            <marker date="1498655799000" expanded="true" signature="6890:7103" ph=" INSERT statement (WELL_TESTS)" />
+            <marker date="1498655799000" expanded="true" signature="7961:7992" ph=" SELECT statement (DAILY_TOTALS)" />
+            <marker date="1498655799000" expanded="true" signature="7961:8002" ph=" SELECT statement (WELL_TESTS)" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/build.gradle b/build.gradle
index c09159e..3246a27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,7 @@ dependencies {
     compile group: 'org.mongodb', name: 'mongodb-driver', version:'3.4.2'
     compile group: 'de.vandermeer', name: 'asciitable', version:'0.2.5'
     compile name: 'IOBoard-0.1'
+    compile 'org.postgresql:postgresql:42.1.1.jre8'
     testCompile group: 'junit', name: 'junit', version:'3.8.1'
 }
 
diff --git a/db_setup.sql b/db_setup.sql
index ad20484..e7fda14 100644
--- a/db_setup.sql
+++ b/db_setup.sql
@@ -2,10 +2,10 @@
 CREATE TABLE IF NOT EXISTS cards(
     id SERIAL PRIMARY KEY,
     stroke_number INTEGER unique,
-    s_p INTEGER ARRAY,
-    s_l INTEGER ARRAY,
-    d_p INTEGER ARRAY,
-    d_l INTEGER ARRAY,
+    surface_position INTEGER ARRAY,
+    surface_load INTEGER ARRAY,
+    downhole_position INTEGER ARRAY,
+    downhole_load INTEGER ARRAY,
     ts_added TIMESTAMP DEFAULT NOW()
 );
 
diff --git a/libs/IOBoard-RPi-0.1.jar b/libs/IOBoard-RPi-0.1.jar
index e6aa6f8904b4b0ede299f0a82dd51bee09a39472..03fb7d1cc04142abed9592fd406d03ec73502cf5 100644
GIT binary patch
delta 2644
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
P{X8ScM3h6-=*Q$g)UN#S

delta 2004
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

diff --git a/src/main/java/com/henrypump/poc/Database.java b/src/main/java/com/henrypump/poc/Database.java
index 66f5c3d..bd8bf19 100644
--- a/src/main/java/com/henrypump/poc/Database.java
+++ b/src/main/java/com/henrypump/poc/Database.java
@@ -17,6 +17,7 @@ import org.bson.Document;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
+import java.sql.*;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
@@ -25,8 +26,224 @@ import static com.mongodb.client.model.Filters.*;
 
 import javax.print.Doc;
 import java.util.*;
+import java.util.Date;
 
-public class Database {
+public class Database{
+    String dbHost = "localhost";
+    String dbName = "poc";
+    Connection dbConn;
+
+
+    private Connection connectToDatabase() {
+        Connection conn = null;
+        try
+        {
+            Class.forName("org.postgresql.Driver");
+            String url = "jdbc:postgresql://" + dbHost + "/"+ dbName;
+            conn = DriverManager.getConnection(url);
+        }
+        catch (ClassNotFoundException e)
+        {
+            e.printStackTrace();
+            System.exit(1);
+        }
+        catch (SQLException e)
+        {
+            e.printStackTrace();
+            System.exit(2);
+        }
+        return conn;
+    }
+
+    Database(){
+        dbConn = connectToDatabase();
+    }
+
+    Database(String dbHostname){
+        dbHost = dbHostname;
+        dbConn = connectToDatabase();
+    }
+
+    static Object[] makeObjectArray(double[] doubleArray) {
+        Object[] objList = new Object[doubleArray.length];
+        for (int i = 0; i < doubleArray.length; i++){
+            objList[i] = (Object) doubleArray[i];
+        }
+        return objList;
+    }
+
+    //CARD FUNCTIONS
+
+    long getLastStrokeNum(){
+
+        long lastStroke = -1;
+        Statement selStmt = null;
+        try {
+            String selString = "SELECT COUNT(id) numCards FROM cards";
+            PreparedStatement ps = dbConn.prepareStatement(selString);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()){
+                lastStroke = rs.getInt("lastStroke");
+            }
+            rs.close();
+            ps.close();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+        System.out.println("Found last stroke to be " + lastStroke);
+        return lastStroke;
+    }
+
+    long newCard(Card inpCard){
+        String sqlInsert = "INSERT INTO cards (stroke_number, surface_position, surface_load, downhole_position, downhole_load) VALUES (?, ?, ?, ?, ?)";
+        long numCards = -1;
+        try {
+            Array surf_pos = dbConn.createArrayOf("real", makeObjectArray(inpCard.getSurfacePosition()));
+            Array surf_lod = dbConn.createArrayOf("real", makeObjectArray(inpCard.getSurfaceLoad()));
+            Array down_pos = dbConn.createArrayOf("real", makeObjectArray(inpCard.getDownholePosition()));
+            Array down_lod = dbConn.createArrayOf("real", makeObjectArray(inpCard.getDownholeLoad()));
+            PreparedStatement prepInsert = dbConn.prepareStatement(sqlInsert);
+            prepInsert.setLong(1, inpCard.getStrokeNumber());
+            prepInsert.setArray(2, surf_pos);
+            prepInsert.setArray(3, surf_lod);
+            prepInsert.setArray(4, down_pos);
+            prepInsert.setArray(5, down_lod);
+
+            prepInsert.executeUpdate();
+            dbConn.commit();
+
+            String selString = "SELECT COUNT(id) numCards FROM cards";
+            PreparedStatement ps = dbConn.prepareStatement(selString);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()){
+                numCards = rs.getLong("numCards");
+            }
+            rs.close();
+            ps.close();
+
+        } catch (SQLException e){
+            e.printStackTrace();
+        }
+        return numCards;
+    }
+
+    // MEASUREMENT FUNCTIONS
+    public long newMeasurementValue(Measurement inpMeasurement){
+        String sqlInsert = "INSERT INTO measurements_num (m_id, val) VALUES (?, ?)";
+        long numMeasurements = -1;
+        try {
+            PreparedStatement prepInsert = dbConn.prepareStatement(sqlInsert);
+            prepInsert.setInt(1, inpMeasurement.getDbId());
+            prepInsert.setDouble(2, inpMeasurement.getCurrentValue());
+            prepInsert.executeUpdate();
+            dbConn.commit();
+
+            String selString = "SELECT COUNT(id) numMeasurements FROM measurements_num";
+            PreparedStatement ps = dbConn.prepareStatement(selString);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()){
+                numMeasurements = rs.getLong("numMeasurements");
+            }
+            rs.close();
+            ps.close();
+
+        } catch (SQLException e){
+            e.printStackTrace();
+        }
+        return numMeasurements;
+    }
+
+    public double getLastStoredMeasurement(int dbId){
+        String sqlSelect = "SELECT val FROM measurments_num WHERE id = (SELECT MAX(id) FROM measurements_num WHERE db_id = ?)";
+        //TODO: Add query to find current average, number of measurements, total, max, and min for today.
+        double retValue = -1;
+        try {
+            PreparedStatement ps = dbConn.prepareStatement(sqlSelect);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()){
+                retValue = rs.getInt("val");
+            }
+            rs.close();
+            ps.close();
+        } catch (SQLException e){
+            e.printStackTrace();
+        }
+
+        return retValue;
+    }
+
+    public long newDailyTotal(Measurement inpMeasurement){
+        String sqlInsert = "INSERT INTO daily_totals (m_id, current_value, max_value, min_value, average_value, total_value) VALUES (?, ?, ?, ?, ?, ?)";
+
+
+        long numMeasurements = -1;
+        try {
+            PreparedStatement prepInsert = dbConn.prepareStatement(sqlInsert);
+            prepInsert.setInt(1, inpMeasurement.getDbId());
+            prepInsert.setDouble(2, inpMeasurement.getCurrentValue());
+            prepInsert.setDouble(3, inpMeasurement.getDailyMax());
+            prepInsert.setDouble(4, inpMeasurement.getDailyMin());
+            prepInsert.setDouble(5, inpMeasurement.getAverage());
+            prepInsert.setDouble(6, inpMeasurement.getTotal());
+            prepInsert.executeUpdate();
+            dbConn.commit();
+
+            String selString = "SELECT COUNT(id) numMeasurements FROM daily_totals";
+            PreparedStatement ps = dbConn.prepareStatement(selString);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()){
+                numMeasurements = rs.getLong("numMeasurements");
+            }
+            rs.close();
+            ps.close();
+
+        } catch (SQLException e){
+            e.printStackTrace();
+        }
+        return numMeasurements;
+
+    }
+
+    public long newWellTest(WellTest inp){
+        String sqlInsert = "INSERT INTO well_tests (test_completed_timestamp, test_hours, total_bbl, oil_bbl, h2o_bbl, gas_mcf," +
+                " k_factor, oil_bbl_ratio, h2o_bbl_ratio, gas_mcf_ratio) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+
+        long numTests = -1;
+        try {
+            PreparedStatement prepInsert = dbConn.prepareStatement(sqlInsert);
+            prepInsert.setTimestamp(1, new Timestamp(Date.from(inp.getTestStart().toInstant()).getTime()));
+            prepInsert.setDouble(2, inp.getTestHours());
+            prepInsert.setDouble(3, inp.getTotalFluidBBL());
+            prepInsert.setDouble(4, inp.getTestOilBBL());
+            prepInsert.setDouble(5, inp.getTestWaterBBL());
+            prepInsert.setDouble(6, inp.getTestGasMCF());
+            prepInsert.setDouble(7, inp.getkFactor());
+            prepInsert.setDouble(8, inp.getOilRatio());
+            prepInsert.setDouble(9, inp.getWaterRatio());
+            prepInsert.setDouble(10, inp.getGasMCFRatio());
+            prepInsert.executeUpdate();
+            dbConn.commit();
+
+            String selString = "SELECT COUNT(id) numTests FROM well_tests";
+            PreparedStatement ps = dbConn.prepareStatement(selString);
+            ResultSet rs = ps.executeQuery();
+            while (rs.next()){
+                numTests = rs.getLong("numTests");
+            }
+            rs.close();
+            ps.close();
+
+        } catch (SQLException e){
+            e.printStackTrace();
+        }
+        return numTests;
+    }
+
+
+}
+
+class MGODatabase {
     private String pocDatabase = "poc";
     private MongoClient mongoClient;
     private MongoDatabase database;
@@ -62,7 +279,7 @@ public class Database {
     }
 
 
-    Database(){
+    MGODatabase(){
         ServerAddress server = new ServerAddress("localhost", 27017);
         List<MongoCredential> credentials = Arrays.asList(credential);
         mongoClient = new MongoClient(server, credentials);
@@ -73,7 +290,7 @@ public class Database {
 
     }
 
-    Database(String dbHostname){
+    MGODatabase(String dbHostname){
         ServerAddress server = new ServerAddress(dbHostname, 27017);
         List<MongoCredential> credentials = Arrays.asList(credential);
         mongoClient = new MongoClient(server, credentials);
diff --git a/src/main/java/com/henrypump/poc/Measurement.java b/src/main/java/com/henrypump/poc/Measurement.java
index f5ed971..49a73f5 100644
--- a/src/main/java/com/henrypump/poc/Measurement.java
+++ b/src/main/java/com/henrypump/poc/Measurement.java
@@ -31,6 +31,7 @@ public class Measurement {
     private String units = null;
     private boolean useTotal;
     private boolean useAverage;
+    private int dbId;
 
     Measurement(String tagName, Database db){
         this.tagName = tagName;
@@ -154,9 +155,9 @@ public class Measurement {
         this.useAverage = useAverage;
     }
 
-
-
-
+    public int getDbId() {
+        return dbId;
+    }
 
     private static boolean isToday(ZonedDateTime inpZDT){
         ZonedDateTime now = ZonedDateTime.now();