diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a6fb124..655a10f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,11 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="28cc251f-c94f-44ee-a66d-77aaab6e3483" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/__init__.py" afterPath="$PROJECT_DIR$/pocwww/pocwww/__init__.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/json.py" afterPath="$PROJECT_DIR$/pocwww/pocwww/json.py" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pocwww/pocwww/templates/setpoints.jinja2" afterPath="$PROJECT_DIR$/pocwww/pocwww/templates/setpoints.jinja2" />
-      <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" />
+      <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" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/.gradle/" />
@@ -134,7 +130,7 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Well.java" pinned="false" current-in-tab="true">
+      <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="272">
@@ -285,11 +281,11 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Database.java" pinned="false" current-in-tab="false">
+      <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="585">
-              <caret line="326" column="64" lean-forward="true" selection-start-line="326" selection-start-column="64" selection-end-line="326" selection-end-column="64" />
+            <state relative-caret-position="450">
+              <caret line="325" column="42" lean-forward="false" selection-start-line="325" selection-start-column="42" selection-end-line="325" selection-end-column="42" />
               <folding />
             </state>
           </provider>
@@ -744,8 +740,8 @@
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/IOControl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/POC.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" />
         <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Well.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/henrypump/poc/Database.java" />
       </list>
     </option>
   </component>
@@ -1880,14 +1876,6 @@
         </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="585">
-          <caret line="326" column="64" lean-forward="true" selection-start-line="326" selection-start-column="64" selection-end-line="326" selection-end-column="64" />
-          <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="510">
@@ -1919,6 +1907,14 @@
         </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="450">
+          <caret line="325" column="42" lean-forward="false" selection-start-line="325" selection-start-column="42" selection-end-line="325" selection-end-column="42" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/src/main/java/com/henrypump/poc/Database.java b/src/main/java/com/henrypump/poc/Database.java
index 762f75f..11647a9 100644
--- a/src/main/java/com/henrypump/poc/Database.java
+++ b/src/main/java/com/henrypump/poc/Database.java
@@ -323,7 +323,7 @@ public class Database {
             String storedBy = setpointDoc.getString("storedBy");
             System.out.println("Setpoint retrieved from database: [" + setpointName + " = " + setpoint + " stored by " + storedBy + "]");
         } catch (ClassCastException e){
-            setpoint = Double.parseDouble(setpointDoc.getString("value"));
+            setpoint = Double.parseDouble(setpointDoc.get("value").toString());
             String storedBy = setpointDoc.getString("storedBy");
             System.out.println("Setpoint retrieved from database: [" + setpointName + " = " + setpoint + " stored by " + storedBy + "]");
         } catch (NullPointerException e){