diff --git a/questionnaires/sample_healthkit/sample_healthkit_armt.json b/questionnaires/sample_healthkit/sample_healthkit_armt.json
index 52987fa0..637230da 100644
--- a/questionnaires/sample_healthkit/sample_healthkit_armt.json
+++ b/questionnaires/sample_healthkit/sample_healthkit_armt.json
@@ -1,347 +1,317 @@
 [
-    {
-        "field_name": "intro_health_collect",
-        "form_name": "healthkit",
-        "section_header": "",
-        "field_type": "info",
-        "field_label": "Introduction",
-        "select_choices_or_calculations": [
-            {
-                "code": "Part1",
-                "label": "Thank you for taking part in the RADAR study. This questionnaire will collect your Healthkit data."
-            },
-            {
-                "code": "Part2",
-                "label": "Please ensure that you enable the HealthKit permissions when prompted. This will allow the RADAR app to collect your data."
-            }
-        ],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "",
-        "matrix_ranking": "",
-        "field_annotation": "info-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "distanceWalkingRunning",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Distance Walking/Running",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "distanceCycling",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Distance Cycling",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "appleExerciseTime",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Exercise Time",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "sleepAnalysis",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Sleep Analysis",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "heartRate",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Heart Rate",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "stepCount",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Step Count",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "activeEnergyBurned",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Active Calories Burned",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "basalEnergyBurned",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Basal Calories Burned",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "flightsClimbed",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Flights Climbed",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "oxygenSaturation",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Oxygen Saturation",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "bloodPressureSystolic",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Blood Pressure Systolic",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "bloodPressureDiastolic",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Blood Pressure Diastolic",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "workoutType",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Workout Type",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "restingHeartRate",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Resting Heart Rate",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    },
-    {
-        "field_name": "respiratoryRate",
-        "form_name": "healthkit",
-        "section_header": "We will be collecting your data for the following.",
-        "field_type": "health",
-        "field_label": "Respiratory Rate",
-        "select_choices_or_calculations": [],
-        "field_note": "",
-        "text_validation_type_or_show_slider_number": "",
-        "text_validation_min": "",
-        "text_validation_max": "",
-        "identifier": "",
-        "branching_logic": "",
-        "required_field": "y",
-        "custom_alignment": "",
-        "question_number": "",
-        "matrix_group_name": "health_data",
-        "matrix_ranking": "",
-        "field_annotation": "matrix-radio-type",
-        "evaluated_logic": ""
-    }
-]
\ No newline at end of file
+  {
+    "field_name": "distanceWalkingRunning",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Distance Walking/Running",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "distanceCycling",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Distance Cycling",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "appleExerciseTime",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Exercise Time",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "sleepAnalysis",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Sleep Analysis",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "heartRate",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Heart Rate",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "stepCount",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Step Count",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "activeEnergyBurned",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Active Calories Burned",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "basalEnergyBurned",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Basal Calories Burned",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "flightsClimbed",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Flights Climbed",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "oxygenSaturation",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Oxygen Saturation",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "bloodPressureSystolic",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Blood Pressure Systolic",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "bloodPressureDiastolic",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Blood Pressure Diastolic",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "workoutType",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Workout Type",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "restingHeartRate",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Resting Heart Rate",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  },
+  {
+    "field_name": "respiratoryRate",
+    "form_name": "healthkit",
+    "section_header": "We will be collecting your data for the following.",
+    "field_type": "health",
+    "field_label": "Respiratory Rate",
+    "select_choices_or_calculations": [],
+    "field_note": "",
+    "text_validation_type_or_show_slider_number": "",
+    "text_validation_min": "",
+    "text_validation_max": "",
+    "identifier": "",
+    "branching_logic": "",
+    "required_field": "y",
+    "custom_alignment": "",
+    "question_number": "",
+    "matrix_group_name": "health_data",
+    "matrix_ranking": "",
+    "field_annotation": "matrix-radio-type",
+    "evaluated_logic": ""
+  }
+]