diff --git a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java
index 4c53de8..5c9e19c 100644
--- a/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java
+++ b/app/src/main/java/com/sf/stormwaterutilityandroid/WaterWay/General.java
@@ -85,7 +85,7 @@ private void setupForm() {
         List<String> pipeTypeOptions = new ArrayList<String>();
         pipeTypeOptions.add("Enclosed Pipe");
         pipeTypeOptions.add("Open Channel");
-        FormElementPickerSingle typeValue = FormElementPickerSingle.createInstance().setTitle("Type").setOptions(pipeTypeOptions);
+        FormElementPickerMulti typeValue = FormElementPickerMulti.createInstance().setTitle("Type").setOptions(pipeTypeOptions);
         type = typeValue.getValue();
 
         List<String> pipeSizeOptions = new ArrayList<String>();
@@ -100,7 +100,7 @@ private void setupForm() {
         pipeSizeOptions.add("20\"");
         pipeSizeOptions.add("24\"");
         pipeSizeOptions.add("36\"");
-        FormElementPickerSingle pipeSizeValue = FormElementPickerSingle.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions);
+        FormElementPickerMulti pipeSizeValue = FormElementPickerMulti.createInstance().setTitle("Pipe Size").setOptions(pipeSizeOptions);
         pipeSize = pipeSizeValue.getValue();
 
         List<String> channelWidthOptions = new ArrayList<String;
@@ -114,7 +114,7 @@ private void setupForm() {
         channelWidthOptions.add("16\"");
         channelWidthOptions.add("18\"");
         channelWidthOptions.add("20\"");
-        FormElementPickerSingle channelBottomWidthValue = FormElementPickerSingle.createInstance().setTitle("Channel Bottom Width")
+        FormElementPickerMulti channelBottomWidthValue = FormElementPickerMulti.createInstance().setTitle("Channel Bottom Width")
                 .setOptions(channelWidthOptions);
         channelBottomWidth = channelBottomWidthValue.getValue();
 
@@ -129,7 +129,7 @@ private void setupForm() {
         receivingWaterOptions.add("Beaver Dam Ditch");
         receivingWaterOptions.add("Kaiser Ditch");
 
-        FormElementPickerSingle receiving = FormElementPickerSingle.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions);
+        FormElementPickerMulti receiving = FormElementPickerMulti.createInstance().setTitle("Receiving Water").setOptions(receivingWaterOptions);
         receivingWater = receiving.getValue();
         /*
         FormElementTextSingleLine routine = FormElementTextSingleLine.createInstance().setTitle("Routine Evaluation").setValue("");