diff --git a/configuration/ampathforms/Triage.json b/configuration/ampathforms/Triage.json
index e689d417..24d9430d 100644
--- a/configuration/ampathforms/Triage.json
+++ b/configuration/ampathforms/Triage.json
@@ -364,401 +364,412 @@
           "isExpanded": "true",
           "questions": [
             {
-              "label": "Have you abstained from sexual intercourse from your last menstrual period/delivery?",
-              "type": "obs",
+              "label": "Pregnancy Screening",
+              "type": "obsGroup",
+              "id": "pregnancyScreeningGroup",
               "questionOptions": {
-                "rendering": "radio",
-                "concept": "160109AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "type": "PIH",
-                    "value": "2730"
-                  },
-                  {
-                    "type": "CIEL",
-                    "value": "160109"
-                  }
-                ],
-                "answers": [
-                  {
-                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "No",
+                "concept": "160108AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "rendering": "group"
+              },
+              "questions": [
+                {
+                  "label": "Have you abstained from sexual intercourse from your last menstrual period/delivery?",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "radio",
+                    "concept": "160109AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "conceptMappings": [
                       {
                         "type": "PIH",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1066"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1066"
+                        "value": "2730"
                       },
                       {
                         "type": "CIEL",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373067005"
+                        "value": "160109"
                       }
-                    ]
-                  },
-                  {
-                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Yes",
-                    "conceptMappings": [
-                      {
-                        "type": "PIH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1065"
-                      },
-                      {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
+                    ],
+                    "answers": [
+                      {
+                        "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "No",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1066"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373067005"
+                          }
+                        ]
+                      },
+                      {
+                        "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "Yes",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373066001"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1065"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1065"
+                          }
+                        ]
                       }
                     ]
-                  }
-                ]
-              },
-              "id": "sexualIntercourseAbstainence",
-              "validators": [],
-              "hide": {
-                "hideWhenExpression": "sex !== 'F' ||sex === 'F' && (age < 10 || age > 49)"
-              }
-            },
-            {
-              "label": "Did your last menstrual period start within the past 7 days",
-              "type": "obs",
-              "questionOptions": {
-                "rendering": "radio",
-                "concept": "160596AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "type": "SNOMED NP",
-                    "value": "NP: 276477006"
-                  },
-                  {
-                    "type": "LOINC",
-                    "value": "8678-5"
                   },
-                  {
-                    "type": "CIEL",
-                    "value": "160596"
+                  "id": "sexualIntercourseAbstainence",
+                  "validators": [],
+                  "hide": {
+                    "hideWhenExpression": "sex !== 'F' ||sex === 'F' && (age < 10 || age > 49)"
                   }
-                ],
-                "answers": [
-                  {
-                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "No",
+                },
+                {
+                  "label": "Did your last menstrual period start within the past 7 days",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "radio",
+                    "concept": "162877AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "conceptMappings": [
                       {
-                        "type": "PIH",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1066"
+                        "type": "SNOMED NP",
+                        "value": "NP: 276477006"
                       },
                       {
-                        "type": "AMPATH",
-                        "value": "1066"
+                        "type": "LOINC",
+                        "value": "8678-5"
                       },
                       {
                         "type": "CIEL",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373067005"
+                        "value": "160596"
                       }
-                    ]
-                  },
-                  {
-                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Yes",
-                    "conceptMappings": [
-                      {
-                        "type": "PIH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1065"
-                      },
-                      {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
+                    ],
+                    "answers": [
+                      {
+                        "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "No",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1066"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373067005"
+                          }
+                        ]
+                      },
+                      {
+                        "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "Yes",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373066001"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1065"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1065"
+                          }
+                        ]
                       }
                     ]
-                  }
-                ]
-              },
-              "id": "menstrualPeriodStart",
-              "validators": [],
-              "hide": {
-                "hideWhenExpression": "sex !== 'F' || sex === 'F' && (age < 10 || age > 49)"
-              }
-            },
-            {
-              "label": "Are you on FP method",
-              "type": "obs",
-              "questionOptions": {
-                "rendering": "radio",
-                "concept": "160653AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "type": "SNOMED NP",
-                    "value": "NP: 423925001"
                   },
-                  {
-                    "type": "CIEL",
-                    "value": "160653"
+                  "id": "menstrualPeriodStart",
+                  "validators": [],
+                  "hide": {
+                    "hideWhenExpression": "sex !== 'F' || sex === 'F' && (age < 10 || age > 49)"
                   }
-                ],
-                "answers": [
-                  {
-                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "No",
+                },
+                {
+                  "label": "Are you on FP method",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "radio",
+                    "concept": "160653AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "conceptMappings": [
                       {
-                        "type": "PIH",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1066"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1066"
+                        "type": "SNOMED NP",
+                        "value": "NP: 423925001"
                       },
                       {
                         "type": "CIEL",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373067005"
+                        "value": "160653"
                       }
-                    ]
-                  },
-                  {
-                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Yes",
-                    "conceptMappings": [
-                      {
-                        "type": "PIH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1065"
-                      },
-                      {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
+                    ],
+                    "answers": [
+                      {
+                        "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "No",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1066"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373067005"
+                          }
+                        ]
+                      },
+                      {
+                        "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "Yes",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373066001"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1065"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1065"
+                          }
+                        ]
                       }
                     ]
-                  }
-                ]
-              },
-              "id": "fpMethod",
-              "validators": [],
-              "hide": {
-                "hideWhenExpression": "sex !== 'F' || sex === 'F' && (age < 10 || age > 49)"
-              }
-            },
-            {
-              "label": "Have you had a miscarriage in the past 7 days",
-              "type": "obs",
-              "questionOptions": {
-                "rendering": "radio",
-                "concept": "48AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "type": "ICD-10-WHO",
-                    "value": "O03.9"
-                  },
-                  {
-                    "type": "AMPATH",
-                    "value": "48"
-                  },
-                  {
-                    "type": "CIEL",
-                    "value": "48"
                   },
-                  {
-                    "type": "PIH",
-                    "value": "48"
-                  },
-                  {
-                    "type": "SNOMED CT",
-                    "value": "CT: 17369002"
+                  "id": "fpMethod",
+                  "validators": [],
+                  "hide": {
+                    "hideWhenExpression": "sex !== 'F' || sex === 'F' && (age < 10 || age > 49)"
                   }
-                ],
-                "answers": [
-                  {
-                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "No",
+                },
+                {
+                  "label": "Have you had a miscarriage in the past 7 days",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "radio",
+                    "concept": "48AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "conceptMappings": [
                       {
-                        "type": "PIH",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1066"
+                        "type": "ICD-10-WHO",
+                        "value": "O03.9"
                       },
                       {
                         "type": "AMPATH",
-                        "value": "1066"
+                        "value": "48"
                       },
                       {
                         "type": "CIEL",
-                        "value": "1066"
+                        "value": "48"
                       },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373067005"
-                      }
-                    ]
-                  },
-                  {
-                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Yes",
-                    "conceptMappings": [
                       {
                         "type": "PIH",
-                        "value": "1065"
+                        "value": "48"
                       },
                       {
                         "type": "SNOMED CT",
-                        "value": "CT: 373066001"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1065"
-                      },
-                      {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
+                        "value": "CT: 17369002"
                       }
-                    ]
-                  }
-                ]
-              },
-              "id": "miscarriagePast7Days",
-              "validators": [],
-              "hide": {
-                "hideWhenExpression": "sex !== 'F' || sex === 'F' && (age < 10 || age > 49)"
-              }
-            },
-            {
-              "label": "Have you had a baby in the last 4 weeks?",
-              "type": "obs",
-              "questionOptions": {
-                "rendering": "radio",
-                "concept": "1657AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                "conceptMappings": [
-                  {
-                    "type": "CIEL",
-                    "value": "1657"
-                  }
-                ],
-                "answers": [
-                  {
-                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "No",
-                    "conceptMappings": [
-                      {
-                        "type": "PIH",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1066"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "CIEL",
-                        "value": "1066"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373067005"
+                    ],
+                    "answers": [
+                      {
+                        "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "No",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1066"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373067005"
+                          }
+                        ]
+                      },
+                      {
+                        "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "Yes",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373066001"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1065"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1065"
+                          }
+                        ]
                       }
                     ]
                   },
-                  {
-                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
-                    "label": "Yes",
+                  "id": "miscarriagePast7Days",
+                  "validators": [],
+                  "hide": {
+                    "hideWhenExpression": "sex !== 'F' || sex === 'F' && (age < 10 || age > 49)"
+                  }
+                },
+                {
+                  "label": "Have you had a baby in the last 4 weeks?",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "radio",
+                    "concept": "1657AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                     "conceptMappings": [
-                      {
-                        "type": "PIH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
-                      },
-                      {
-                        "type": "PIH Malawi",
-                        "value": "Malawi: 1065"
-                      },
                       {
                         "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
+                        "value": "1657"
+                      }
+                    ],
+                    "answers": [
+                      {
+                        "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "No",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1066"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1066"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373067005"
+                          }
+                        ]
+                      },
+                      {
+                        "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                        "label": "Yes",
+                        "conceptMappings": [
+                          {
+                            "type": "PIH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373066001"
+                          },
+                          {
+                            "type": "PIH Malawi",
+                            "value": "Malawi: 1065"
+                          },
+                          {
+                            "type": "CIEL",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1065"
+                          }
+                        ]
                       }
                     ]
+                  },
+                  "id": "hadBabyInLast4Weeks",
+                  "validators": [],
+                  "hide": {
+                    "hideWhenExpression": "isEmpty(miscarriagePast7Days) || miscarriagePast7Days !== '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
                   }
-                ]
-              },
-              "id": "hadBabyInLast4Weeks",
-              "validators": [],
-              "hide": {
-                "hideWhenExpression": "isEmpty(miscarriagePast7Days) || miscarriagePast7Days !== '1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' "
-              }
+                }
+              ]
             }
           ],
           "hide": {
@@ -774,7 +785,7 @@
               "type": "obs",
               "questionOptions": {
                 "rendering": "radio",
-                "concept": "1648AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "concept": "1282AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
                   {
                     "type": "CIEL",
@@ -788,11 +799,11 @@
                 "answers": [
                   {
                     "label": "Yes",
-                    "concept": "true"
+                    "concept": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                   },
                   {
                     "label": "No",
-                    "concept": "false"
+                    "concept": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
                   }
                 ]
               },
@@ -806,8 +817,8 @@
               "label": "Triage Notes:",
               "type": "obs",
               "questionOptions": {
-                "rendering": "text",
-                "concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
+                "rendering": "textarea",
+                "concept": "159395AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
                 "conceptMappings": [
                   {
                     "type": "CIEL",