diff --git a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
index 69eb5cb44..321c05fc5 100644
--- a/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
+++ b/distro/configuration/ampathforms/ct_clinical_visit_v2.0.json
@@ -9104,101 +9104,148 @@
           "questions": [
             {
               "label": "CD4 Lab Results",
-              "type": "obs",
+              "type": "obsGroup",
+              "id": "cd4ResultObsGroup",
               "questionOptions": {
-                "rendering": "radio",
-                "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0",
-                "conceptMappings": [
-                  {
-                    "type": "OCT",
-                    "value": "LabOrdered"
-                  }
-                ],
-                "answers": [
-                  {
-                    "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3",
-                    "label": "Yes",
+                "rendering": "group",
+                "concept": "c731a01e-7268-11ee-b962-0242ac120002",
+                "conceptMappings": []
+              },
+              "questions": [
+                {
+                  "label": "CD4 Lab Results",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "toggle",
+                    "concept": "9674e958-7269-11ee-b962-0242ac120002",
+                    "toggleOptions": {
+                      "labelTrue": "Yes",
+                      "labelFalse": "No"
+                    },
                     "conceptMappings": [
                       {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "PIH",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
+                        "type": "OCT",
+                        "value": "LabOrdered"
                       }
                     ]
                   },
-                  {
-                    "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594",
-                    "label": "No",
-                    "conceptMappings": []
-                  }
-                ]
-              },
-              "id": "cd4LabResultsToggle",
-              "behaviours": [
+                  "id": "cd4LabResultsToggle",
+                  "behaviours": [
+                    {
+                      "intent": "*",
+                      "required": "false"
+                    }
+                  ]
+                },
                 {
-                  "intent": "*",
-                  "required": "false"
+                  "label": "Which form was filled?",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "fixed-value",
+                    "concept": "5ac76d80-726a-11ee-b962-0242ac120002",
+                    "conceptMappings": []
+                  },
+                  "id": "cd4Lab",
+                  "behaviours": [
+                    {
+                      "intent": "*",
+                      "hide": {
+                        "hideWhenExpression": "false"
+                      },
+                      "value": "CD4 Lab Result"
+                    }
+                  ]
                 }
               ]
-            },
+            }
+          ]
+        },
+        {
+          "label": "Viral Lab Results",
+          "isExpanded": "true",
+          "questions": [
             {
               "label": "Viral Lab Results",
-              "type": "obs",
+              "type": "obsGroup",
+              "id": "viralLabResultObsGroup",
               "questionOptions": {
-                "rendering": "radio",
-                "concept": "2dbf01ab-77f6-4b35-aa2c-46dfc14b0af0",
-                "conceptMappings": [
-                  {
-                    "type": "OCT",
-                    "value": "LabOrdered"
-                  }
-                ],
-                "answers": [
-                  {
-                    "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3",
-                    "label": "Yes",
+                "rendering": "group",
+                "concept": "c731a01e-7268-11ee-b962-0242ac120002",
+                "conceptMappings": []
+              },
+              "questions": [
+                {
+                  "label": "Viral Lab Results",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "toggle",
+                    "concept": "9674e958-7269-11ee-b962-0242ac120002",
+                    "toggleOptions": {
+                      "labelTrue": "Yes",
+                      "labelFalse": "No"
+                    },
                     "conceptMappings": [
                       {
-                        "type": "CIEL",
-                        "value": "1065"
-                      },
-                      {
-                        "type": "AMPATH",
-                        "value": "1065"
-                      },
+                        "type": "OCT",
+                        "value": "LabOrdered"
+                      }
+                    ],
+                    "answers": [
                       {
-                        "type": "PIH",
-                        "value": "1065"
+                        "concept": "cf82933b-3f3f-45e7-a5ab-5d31aaee3da3",
+                        "label": "Yes",
+                        "conceptMappings": [
+                          {
+                            "type": "CIEL",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "AMPATH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "PIH",
+                            "value": "1065"
+                          },
+                          {
+                            "type": "SNOMED CT",
+                            "value": "CT: 373066001"
+                          }
+                        ]
                       },
                       {
-                        "type": "SNOMED CT",
-                        "value": "CT: 373066001"
+                        "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594",
+                        "label": "No",
+                        "conceptMappings": []
                       }
                     ]
                   },
-                  {
-                    "concept": "488b58ff-64f5-4f8a-8979-fa79940b1594",
-                    "label": "No",
-                    "conceptMappings": []
-                  }
-                ]
-              },
-              "id": "viralLabResultsToggle",
-              "behaviours": [
+                  "id": "viralLabResultsToggle",
+                  "behaviours": [
+                    {
+                      "intent": "*",
+                      "required": "false"
+                    }
+                  ]
+                },
                 {
-                  "intent": "*",
-                  "required": "false"
+                  "label": "Which form was filled?",
+                  "type": "obs",
+                  "questionOptions": {
+                    "rendering": "fixed-value",
+                    "concept": "5ac76d80-726a-11ee-b962-0242ac120002",
+                    "conceptMappings": []
+                  },
+                  "id": "viralLoad",
+                  "behaviours": [
+                    {
+                      "intent": "*",
+                      "hide": {
+                        "hideWhenExpression": "false"
+                      },
+                      "value": "Viral Load Lab Result"
+                    }
+                  ]
                 }
               ]
             }
@@ -9224,7 +9271,7 @@
       "behaviours": [
         {
           "intent": "*",
-                      "hide": {
+          "hide": {
             "hideWhenExpression": "cd4LabResultsToggle == '488b58ff-64f5-4f8a-8979-fa79940b1594'"
           }
         }
diff --git a/distro/configuration/ocl/OHRITechGroup_P-Tracker_v202310311536.2023-10-31_073705.zip b/distro/configuration/ocl/OHRITechGroup_P-Tracker_v202310311536.2023-10-31_073705.zip
new file mode 100644
index 000000000..ef1096ab5
Binary files /dev/null and b/distro/configuration/ocl/OHRITechGroup_P-Tracker_v202310311536.2023-10-31_073705.zip differ