diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java
index 7dd92ca..b7449aa 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWay.java
@@ -22,28 +22,62 @@ public WaterWay() {
         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));
+
+        WaterWayDoubleFields.put("WQI", new Double(0.0));
+        WaterWayDoubleFields.put("HEI", new Double(0.0));
+        WaterWayDoubleFields.put("PTI", new Double(0.0));
+
+        //Boolean Fields
+        WaterWayBoolFields.put("DWS_needs_maintenance", new Boolean(false));
+        WaterWayBoolFields.put("DWS_obstruction", new Boolean(false));
+        WaterWayBoolFields.put("DWS_polutants", new Boolean(false));
+        WaterWayBoolFields.put("DWS_presence_of_flow", new Boolean(false));
+        WaterWayBoolFields.put("DWS_screened_OK", new Boolean(false));
+        WaterWayBoolFields.put("DWS_unusual_color", new Boolean(false));
+        WaterWayBoolFields.put("DWS_unusual_odor", new Boolean(false));
+        WaterWayBoolFields.put("FC_complaint_investigation", new Boolean(false));
+        WaterWayBoolFields.put("FC_further_action_needed", new Boolean(false));
+        WaterWayBoolFields.put("FC_illicit_discharge_detected", new Boolean(false));
+        WaterWayBoolFields.put("FC_no_illicit_discharge_detected", new Boolean(false));
+        WaterWayBoolFields.put("FC_routine_evaluation", new Boolean(false));
+
+        //String Fields
+//HEI Data
+        WaterWayStringFields.put("QHEI_substrate_size", "");
+        WaterWayStringFields.put("QHEI_smothering", "");
+        WaterWayStringFields.put("QHEI_silting", "");
+        WaterWayStringFields.put("QHEI_rootwads", "");
+        WaterWayStringFields.put("QHEI_overhanging_veg", "");
+        WaterWayStringFields.put("QHEI_oxbowsblack_waters", "");
+        WaterWayStringFields.put("QHEI_downed_treeslogs","");
+        WaterWayStringFields.put("QHEI_shallows", "");
+        WaterWayStringFields.put("QHEI_water_plants", "");
+        WaterWayStringFields.put("QHEI_deep_pools", "");
+        WaterWayStringFields.put("QHEI_logswoody_debris", "");
+        WaterWayStringFields.put("QHEI_boulders", "");
+        WaterWayStringFields.put("QHEI_undercut_banks", "");
+        WaterWayStringFields.put("QHEI_sinuosity", "");
+        WaterWayStringFields.put("QHEI_riparian_width", "");
+        WaterWayStringFields.put("QHEI_land_use", "");
+        WaterWayStringFields.put("QHEI_bank_erosion", "");
+        WaterWayStringFields.put("QHEI_stream_shading", "");
+        WaterWayStringFields.put("QHEI_deepest_pool", "");
+        WaterWayStringFields.put("QHEI_velocity", "");
+        WaterWayStringFields.put("QHEI_rifflerun_depth", "");
+        WaterWayStringFields.put("QHEI_rifflerun_substrate", "");
+
+        WaterWayStringFields.put("GOD_channel_bottom_width", "");
+        WaterWayStringFields.put("GOD_invert_elevation", "");
+        WaterWayStringFields.put("GOD_latitude", "");
+        WaterWayStringFields.put("GOD_longitude", "");
+        WaterWayStringFields.put("GOD_outfall", "");
+        WaterWayStringFields.put("GOD_pipe_size", "");
+        WaterWayStringFields.put("GOD_receiving_water", "");
+        WaterWayStringFields.put("GOD_type", "");
+
+        //Comments
+        WaterWayStringFields.put("CS_comments", "");
+        WaterWayStringFields.put("CT_other_1", "");
+        WaterWayStringFields.put("CT_other_2", "");
     }
 }