diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
index 19e621c..21cb7aa 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/ChemicalTesting.java
@@ -93,6 +93,5 @@ private void setupForm() {
         formItems.add(other2Data);
 
         formBuilder.addFormElements(formItems);
-
     }
 }
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java
new file mode 100644
index 0000000..7dd92ca
--- /dev/null
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java
@@ -0,0 +1,49 @@
+package com.sf.stormwaterutilityandroid.WaterWay;
+
+import java.util.Map;
+import java.util.HashMap;
+
+public class WaterWay {
+
+    private Map<String, Double> WaterWayDoubleFields = new HashMap<String, Double>();
+    private Map<String, Boolean> WaterWayBoolFields = new HashMap<String, Boolean>();
+    private Map<String, String> WaterWayStringFields = new HashMap<String, String>();
+
+    public WaterWay() {
+        //Water Quality Index Data
+        WaterWayDoubleFields.put("CT_temperature_change", new Double(0.0));
+        WaterWayDoubleFields.put("CT_turbidity", new Double(0.0));
+        WaterWayDoubleFields.put("CT_pH", new Double(0.0));
+        WaterWayDoubleFields.put("CT_nitrate", new Double(0.0));
+        WaterWayDoubleFields.put("CT_total_phosphate", new Double(0.0));
+        WaterWayDoubleFields.put("CT_dissolved_oxygen", new Double(0.0));
+        //PTI Data
+        WaterWayDoubleFields.put("BM_intolerant", new Double(0.0));
+        WaterWayDoubleFields.put("BM_moderately_tolerant", new Double(0.0));
+        WaterWayDoubleFields.put("BM_fairly_tolerant", new Double(0.0));
+        WaterWayDoubleFields.put("BM_very_tolerant", new Double(0.0));
+        //HEI Data
+        WaterWayDoubleFields.put("QHEI_substrate_size", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_smothering", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_silting", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_rootwads", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_overhanging_veg", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_oxbowsblack_waters", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_downed_treeslogs", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_shallows", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_water_plants", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_deep_pools", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_logswoody_debris", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_boulders", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_undercut_banks", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_sinuosity", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_riparian_width", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_land_use", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_bank_erosion", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_stream_shading", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_deepest_pool", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_velocity", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_rifflerun_depth", new Double(0.0));
+        WaterWayDoubleFields.put("QHEI_rifflerun_substrate", new Double(0.0));
+    }
+}
diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
index a797f99..11b3bf1 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
@@ -29,7 +29,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void setupForm() {
 
-
         formBuilder = new FormBuilder(this, recyclerView);
         FormElementTextNumber element2 = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0");
         FormElementTextNumber element3 = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0");
@@ -70,6 +69,7 @@ private void setupForm() {
         formItems.add(element17);
         formItems.add(element18);
         formItems.add(element19);
+
         formBuilder.addFormElements(formItems);
 
     }