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 11b3bf1..2d934ac 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/WaterWayForm.java
@@ -8,7 +8,9 @@
 import com.sf.stormwaterutilityandroid.R;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import me.riddhimanadib.formmaster.FormBuilder;
 import me.riddhimanadib.formmaster.model.BaseFormElement;
@@ -18,59 +20,124 @@ public class WaterWayForm extends AppCompatActivity {
     //HQ form
     private FormBuilder formBuilder;
     private RecyclerView recyclerView;
+    double subVal = 0.0;
+    double smothVal = 0.0;
+    double siltVal = 0.0;
+    double rootVal = 0.0;
+    double overVegVal = 0.0;
+    double oxVal = 0.0;
+    double downVal = 0.0;
+    double shallowVal = 0.0;
+    double watVal = 0.0;
+    double deepVal = 0.0;
+    double logVal = 0.0;
+    double bouldVal = 0.0;
+    double underVal = 0.0;
+    double sinVal = 0.0;
+    double natVal = 0.0;
+    double ripVal = 0.0;
+    double landVal = 0.0;
+    double bankVal = 0.0;
+
+    //Tolerant Form
+    double intolerantVal = 0.0;
+    double modTolerantVal = 0.0;
+    double fairTolerantVal = 0.0;
+    double veryTolerantVal = 0.0;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_sample_fordm);
         recyclerView = findViewById(R.id.recyclerView2);
-        setupForm();
+        setupHQForm();
     }
 
-    private void setupForm() {
+    private void setupHQForm() {
 
         formBuilder = new FormBuilder(this, recyclerView);
-        FormElementTextNumber element2 = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0");
-        FormElementTextNumber element3 = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0");
-        FormElementTextNumber element4 = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0");
-        FormElementTextNumber element5 = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0");
-        FormElementTextNumber element6 = FormElementTextNumber.createInstance().setTitle("Overhanging Veg.").setValue("0");
-        FormElementTextNumber element7 = FormElementTextNumber.createInstance().setTitle("Oxbows/Black Waters").setValue("0");
-        FormElementTextNumber element8 = FormElementTextNumber.createInstance().setTitle("Downed Trees/Logs").setValue("0");
-        FormElementTextNumber element9 = FormElementTextNumber.createInstance().setTitle("Shallows (slow water)").setValue("0");
-        FormElementTextNumber element10 = FormElementTextNumber.createInstance().setTitle("Water Plants").setValue("0");
-        FormElementTextNumber element11 = FormElementTextNumber.createInstance().setTitle("Deep Pools").setValue("0");
-        FormElementTextNumber element12 = FormElementTextNumber.createInstance().setTitle("Logs/Woody Debris").setValue("0");
-        FormElementTextNumber element13 = FormElementTextNumber.createInstance().setTitle("Boulders").setValue("0");
-        FormElementTextNumber element14 = FormElementTextNumber.createInstance().setTitle("Undercut Banks").setValue("0");
-        FormElementTextNumber element15 = FormElementTextNumber.createInstance().setTitle("Sinuosity").setValue("0");
-        FormElementTextNumber element16 = FormElementTextNumber.createInstance().setTitle("Natural").setValue("0");
-        FormElementTextNumber element17 = FormElementTextNumber.createInstance().setTitle("Riparian Width").setValue("0");
-        FormElementTextNumber element18 = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0");
-        FormElementTextNumber element19 = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0");
+        FormElementTextNumber subSize = FormElementTextNumber.createInstance().setTitle("Substrate Size").setValue("0");
+        FormElementTextNumber smothering = FormElementTextNumber.createInstance().setTitle("Smothering").setValue("0");
+        FormElementTextNumber silting = FormElementTextNumber.createInstance().setTitle("Silting").setValue("0");
+        FormElementTextNumber rootwads = FormElementTextNumber.createInstance().setTitle("Rootwads").setValue("0");
+        FormElementTextNumber overhangingVeg = FormElementTextNumber.createInstance().setTitle("Overhanging Veg.").setValue("0");
+        FormElementTextNumber oxbows = FormElementTextNumber.createInstance().setTitle("Oxbows/Black Waters").setValue("0");
+        FormElementTextNumber downed = FormElementTextNumber.createInstance().setTitle("Downed Trees/Logs").setValue("0");
+        FormElementTextNumber shallows = FormElementTextNumber.createInstance().setTitle("Shallows (slow water)").setValue("0");
+        FormElementTextNumber waterPlants = FormElementTextNumber.createInstance().setTitle("Water Plants").setValue("0");
+        FormElementTextNumber deepPools = FormElementTextNumber.createInstance().setTitle("Deep Pools").setValue("0");
+        FormElementTextNumber logs = FormElementTextNumber.createInstance().setTitle("Logs/Woody Debris").setValue("0");
+        FormElementTextNumber boulders = FormElementTextNumber.createInstance().setTitle("Boulders").setValue("0");
+        FormElementTextNumber undercutBanks = FormElementTextNumber.createInstance().setTitle("Undercut Banks").setValue("0");
+        FormElementTextNumber sinuosity = FormElementTextNumber.createInstance().setTitle("Sinuosity").setValue("0");
+        FormElementTextNumber natural = FormElementTextNumber.createInstance().setTitle("Natural").setValue("0");
+        FormElementTextNumber riparianWidth = FormElementTextNumber.createInstance().setTitle("Riparian Width").setValue("0");
+        FormElementTextNumber landUse = FormElementTextNumber.createInstance().setTitle("Land Use").setValue("0");
+        FormElementTextNumber bankErosion = FormElementTextNumber.createInstance().setTitle("Bank Erosion").setValue("0");
 
 
         List<BaseFormElement> formItems = new ArrayList<>();
-        formItems.add(element2);
-        formItems.add(element3);
-        formItems.add(element4);
-        formItems.add(element5);
-        formItems.add(element6);
-        formItems.add(element7);
-        formItems.add(element8);
-        formItems.add(element9);
-        formItems.add(element10);
-        formItems.add(element11);
-        formItems.add(element12);
-        formItems.add(element13);
-        formItems.add(element14);
-        formItems.add(element15);
-        formItems.add(element16);
-        formItems.add(element17);
-        formItems.add(element18);
-        formItems.add(element19);
+        formItems.add(subSize);
+        formItems.add(smothering);
+        formItems.add(silting);
+        formItems.add(rootwads);
+        formItems.add(overhangingVeg);
+        formItems.add(oxbows);
+        formItems.add(downed);
+        formItems.add(shallows);
+        formItems.add(waterPlants);
+        formItems.add(deepPools);
+        formItems.add(logs);
+        formItems.add(boulders);
+        formItems.add(undercutBanks);
+        formItems.add(sinuosity);
+        formItems.add(natural);
+        formItems.add(riparianWidth);
+        formItems.add(landUse);
+        formItems.add(bankErosion);
 
         formBuilder.addFormElements(formItems);
 
+        subVal = Double.parseDouble(subSize.getValue());
+        smothVal = Double.parseDouble(smothering.getValue());
+        siltVal = Double.parseDouble(silting.getValue());
+        rootVal = Double.parseDouble(rootwads.getValue());
+        overVegVal = Double.parseDouble(overhangingVeg.getValue());
+        oxVal = Double.parseDouble(oxbows.getValue());
+        downVal = Double.parseDouble(downed.getValue());
+        shallowVal = Double.parseDouble(shallows.getValue());
+        watVal = Double.parseDouble(waterPlants.getValue());
+        deepVal = Double.parseDouble(deepPools.getValue());
+        logVal = Double.parseDouble(logs.getValue());
+        bouldVal = Double.parseDouble(boulders.getValue());
+        underVal = Double.parseDouble(undercutBanks.getValue());
+        sinVal = Double.parseDouble(sinuosity.getValue());
+        natVal = Double.parseDouble(natural.getValue());
+        ripVal = Double.parseDouble(riparianWidth.getValue());
+        landVal = Double.parseDouble(landUse.getValue());
+        bankVal = Double.parseDouble(bankErosion.getValue());
+
+
+    }
+    private void setupTolerantForm(){
+        formBuilder = new FormBuilder(this, recyclerView);
+        FormElementTextNumber intolerant = FormElementTextNumber.createInstance().setTitle("Intolerant").setValue("0");
+        FormElementTextNumber moderatelyTolerant = FormElementTextNumber.createInstance().setTitle("Moderately Tolerant").setValue("0");
+        FormElementTextNumber fairlyTolerant = FormElementTextNumber.createInstance().setTitle("Fairly Tolerant").setValue("0");
+        FormElementTextNumber veryTolerant = FormElementTextNumber.createInstance().setTitle("Very Tolerant").setValue("0");
+
+        List<BaseFormElement> formItems = new ArrayList<>();
+        formItems.add(intolerant);
+        formItems.add(moderatelyTolerant);
+        formItems.add(fairlyTolerant);
+        formItems.add(veryTolerant);
+
+        intolerantVal = Double.parseDouble(intolerant.getValue());
+        modTolerantVal = Double.parseDouble(moderatelyTolerant.getValue());
+        fairTolerantVal = Double.parseDouble(fairlyTolerant.getValue());
+        veryTolerantVal = Double.parseDouble(veryTolerant.getValue());
+
+
+
     }
 }
\ No newline at end of file