diff --git a/services/app-api/forms/cmit.ts b/services/app-api/forms/cmit.ts
index 70ea0d6b..de238a48 100644
--- a/services/app-api/forms/cmit.ts
+++ b/services/app-api/forms/cmit.ts
@@ -6,6 +6,7 @@ import {
 } from "../utils/constants";
 
 export const CMIT_LIST: CMIT[] = [
+  // required measures
   {
     cmit: 960,
     name: "LTSS-1: Comprehensive Assessment and Update",
@@ -32,6 +33,67 @@ export const CMIT_LIST: CMIT[] = [
     dataSource: DataSource.Hybrid,
     options: "",
   },
+  {
+    cmit: 20,
+    name: "LTSS-6: Admission to a Facility from the Community",
+    uid: "20",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.Administrative,
+    options: "",
+  },
+  {
+    cmit: 968,
+    name: "LTSS-7: Minimizing Facility Length of Stay",
+    uid: "968",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.Administrative,
+    options: "",
+  },
+  {
+    cmit: 414,
+    name: "LTSS-8: Successful Transition after Long-Term Facility Stay",
+    uid: "414",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.Administrative,
+    options: "",
+  },
+  // optional measures
+  {
+    cmit: 969,
+    name: "FASI-1: Identification of Person-Centered Priorities",
+    uid: "969",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.RecordReview,
+    options: "",
+  },
+  {
+    cmit: 970,
+    name: "FASI-2: Documentation of a Person-Centered Service Plan",
+    uid: "970",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.RecordReview,
+    options: "",
+  },
+  {
+    cmit: 111,
+    name: "HCBS-10: Self-direction of Services and Supports Among Medicaid Beneficiaries Receiving LTSS through Managed Care Organizations",
+    uid: "111",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.MLTSS],
+    dataSource: DataSource.CaseRecordManagement,
+    options: "",
+  },
   {
     cmit: 963,
     name: "LTSS-3: Shared Person-Centered Plan with Primary Care Provider",
@@ -68,34 +130,4 @@ export const CMIT_LIST: CMIT[] = [
     dataSource: DataSource.Hybrid,
     options: "",
   },
-  {
-    cmit: 20,
-    name: "LTSS-6: Admission to a Facility from the Community",
-    uid: "20",
-    measureSteward: "CMS",
-    measureSpecification: [MeasureSpecification.CMS],
-    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
-    dataSource: DataSource.Administrative,
-    options: "",
-  },
-  {
-    cmit: 968,
-    name: "LTSS-7: Minimizing Facility Length of Stay",
-    uid: "968",
-    measureSteward: "CMS",
-    measureSpecification: [MeasureSpecification.CMS],
-    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
-    dataSource: DataSource.Administrative,
-    options: "",
-  },
-  {
-    cmit: 414,
-    name: "LTSS-8: Successful Transition after Long-Term Facility Stay",
-    uid: "414",
-    measureSteward: "CMS",
-    measureSpecification: [MeasureSpecification.CMS],
-    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
-    dataSource: DataSource.Administrative,
-    options: "",
-  },
 ];
diff --git a/services/app-api/forms/qm.ts b/services/app-api/forms/qm.ts
index 56df7352..9f480821 100644
--- a/services/app-api/forms/qm.ts
+++ b/services/app-api/forms/qm.ts
@@ -266,7 +266,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -327,8 +327,8 @@ export const qmReportTemplate: ReportTemplate = {
       elements: [
         {
           type: ElementType.ButtonLink,
-          label: "Return to Optional Measures Dashboard",
-          to: "optional-measure-result",
+          label: "Return to Required Measures Dashboard",
+          to: "req-measure-result",
         },
         {
           type: ElementType.Header,
@@ -356,7 +356,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -445,7 +445,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -536,7 +536,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -627,7 +627,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -687,14 +687,160 @@ export const qmReportTemplate: ReportTemplate = {
       title: "FASI-1: Identification of Person-Centered Priorities",
       type: PageType.Measure,
       sidebar: false,
-      elements: [],
+      elements: [
+        {
+          type: ElementType.ButtonLink,
+          label: "Return to Optional Measures Dashboard",
+          to: "optional-measure-result",
+        },
+        {
+          type: ElementType.Header,
+          text: "{measureName}",
+        },
+        {
+          type: ElementType.Accordion,
+          label: "Instructions",
+          value:
+            "[Optional instructional content that could support the user in completing this page]",
+        },
+        {
+          type: ElementType.SubHeader,
+          text: "Measure Details",
+        },
+        {
+          type: ElementType.Radio,
+          label: "Were the reported measure results audited or validated?",
+          value: [
+            { label: "No, I am reporting on this measure", value: "no" },
+            {
+              label: "Yes, CMS is reporting on my behalf",
+              value: "yes",
+              checkedChildren: [
+                {
+                  type: ElementType.Textbox,
+                  label:
+                    "What is the name of the agency or entity that audited or validated the report?",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          type: ElementType.Radio,
+          label:
+            "Did you deviate from the [reportYear] Technical Specifications?",
+          value: [
+            { label: "No", value: "no" },
+            {
+              label: "Yes",
+              value: "yes",
+              checkedChildren: [
+                {
+                  type: ElementType.Textbox,
+                  label: "Please explain the deviation.",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          type: ElementType.Radio,
+          label: "Which delivery systems were used to report the LTSS measure?",
+          value: [
+            { label: "Managed Care", value: "managed-care" },
+            { label: "Fee-For-Service", value: "fee-for-service" },
+            { label: "Both", value: "both" },
+          ],
+        },
+        {
+          type: ElementType.SubHeader,
+          text: "Quality Measures",
+        },
+        {
+          type: ElementType.QualityMeasureTable,
+          measureDisplay: "quality",
+        },
+      ],
     },
     [MeasureTemplateName["FASI-2"]]: {
       id: "FASI-2",
       title: "FASI-2: Documentation of a Person-Centered Service Plan",
       type: PageType.Measure,
       sidebar: false,
-      elements: [],
+      elements: [
+        {
+          type: ElementType.ButtonLink,
+          label: "Return to Optional Measures Dashboard",
+          to: "optional-measure-result",
+        },
+        {
+          type: ElementType.Header,
+          text: "{measureName}",
+        },
+        {
+          type: ElementType.Accordion,
+          label: "Instructions",
+          value:
+            "[Optional instructional content that could support the user in completing this page]",
+        },
+        {
+          type: ElementType.SubHeader,
+          text: "Measure Details",
+        },
+        {
+          type: ElementType.Radio,
+          label: "Were the reported measure results audited or validated?",
+          value: [
+            { label: "No, I am reporting on this measure", value: "no" },
+            {
+              label: "Yes, CMS is reporting on my behalf",
+              value: "yes",
+              checkedChildren: [
+                {
+                  type: ElementType.Textbox,
+                  label:
+                    "What is the name of the agency or entity that audited or validated the report?",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          type: ElementType.Radio,
+          label:
+            "Did you deviate from the [reportYear] Technical Specifications?",
+          value: [
+            { label: "No", value: "no" },
+            {
+              label: "Yes",
+              value: "yes",
+              checkedChildren: [
+                {
+                  type: ElementType.Textbox,
+                  label: "Please explain the deviation.",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          type: ElementType.Radio,
+          label: "Which delivery systems were used to report the LTSS measure?",
+          value: [
+            { label: "Managed Care", value: "managed-care" },
+            { label: "Fee-For-Service", value: "fee-for-service" },
+            { label: "Both", value: "both" },
+          ],
+        },
+        {
+          type: ElementType.SubHeader,
+          text: "Quality Measures",
+        },
+        {
+          type: ElementType.QualityMeasureTable,
+          measureDisplay: "quality",
+        },
+      ],
     },
     [MeasureTemplateName["HCBS-10"]]: {
       id: "HCBS-10",
@@ -702,7 +848,71 @@ export const qmReportTemplate: ReportTemplate = {
         "HCBS-10: Self-direction of Services and Supports Among Medicaid Beneficiaries Receiving LTSS through Managed Care Organizations",
       type: PageType.Measure,
       sidebar: false,
-      elements: [],
+      elements: [
+        {
+          type: ElementType.ButtonLink,
+          label: "Return to Optional Measures Dashboard",
+          to: "optional-measure-result",
+        },
+        {
+          type: ElementType.Header,
+          text: "{measureName}",
+        },
+        {
+          type: ElementType.Accordion,
+          label: "Instructions",
+          value:
+            "[Optional instructional content that could support the user in completing this page]",
+        },
+        {
+          type: ElementType.SubHeader,
+          text: "Measure Details",
+        },
+        {
+          type: ElementType.Radio,
+          label: "Were the reported measure results audited or validated?",
+          value: [
+            { label: "No, I am reporting on this measure", value: "no" },
+            {
+              label: "Yes, CMS is reporting on my behalf",
+              value: "yes",
+              checkedChildren: [
+                {
+                  type: ElementType.Textbox,
+                  label:
+                    "What is the name of the agency or entity that audited or validated the report?",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          type: ElementType.Radio,
+          label:
+            "Did you deviate from the [reportYear] Technical Specifications?",
+          value: [
+            { label: "No", value: "no" },
+            {
+              label: "Yes",
+              value: "yes",
+              checkedChildren: [
+                {
+                  type: ElementType.Textbox,
+                  label: "Please explain the deviation.",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          type: ElementType.SubHeader,
+          text: "Quality Measures",
+        },
+        {
+          type: ElementType.QualityMeasureTable,
+          measureDisplay: "quality",
+        },
+      ],
     },
     [MeasureTemplateName["LTSS-3"]]: {
       id: "LTSS-3",
@@ -741,7 +951,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -831,7 +1041,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -921,7 +1131,7 @@ export const qmReportTemplate: ReportTemplate = {
                 {
                   type: ElementType.Textbox,
                   label:
-                    "What is the name of the agency of entity that audited or validated the report?",
+                    "What is the name of the agency or entity that audited or validated the report?",
                 },
               ],
             },
@@ -945,6 +1155,14 @@ export const qmReportTemplate: ReportTemplate = {
             },
           ],
         },
+        {
+          type: ElementType.SubHeader,
+          text: "Quality Measures",
+        },
+        {
+          type: ElementType.QualityMeasureTable,
+          measureDisplay: "quality",
+        },
       ],
     },
   } as Record<MeasureTemplateName, MeasurePageTemplate>,
diff --git a/services/ui-src/src/cmit.ts b/services/ui-src/src/cmit.ts
index 0781dea8..783d157f 100644
--- a/services/ui-src/src/cmit.ts
+++ b/services/ui-src/src/cmit.ts
@@ -1,6 +1,7 @@
 import { CMIT, DeliverySystem, DataSource, MeasureSpecification } from "types";
 
 export const CMIT_LIST: CMIT[] = [
+  // required measures
   {
     cmit: 960,
     name: "LTSS-1: Comprehensive Assessment and Update",
@@ -14,7 +15,6 @@ export const CMIT_LIST: CMIT[] = [
     dataSource: DataSource.Hybrid,
     options: "",
   },
-
   {
     cmit: 961,
     name: "LTSS-2: Comprehensive Person-Centered Plan and Update",
@@ -28,6 +28,67 @@ export const CMIT_LIST: CMIT[] = [
     dataSource: DataSource.Hybrid,
     options: "",
   },
+  {
+    cmit: 20,
+    name: "LTSS-6: Admission to a Facility from the Community",
+    uid: "20",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.Administrative,
+    options: "",
+  },
+  {
+    cmit: 968,
+    name: "LTSS-7: Minimizing Facility Length of Stay",
+    uid: "968",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.Administrative,
+    options: "",
+  },
+  {
+    cmit: 414,
+    name: "LTSS-8: Successful Transition after Long-Term Facility Stay",
+    uid: "414",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.Administrative,
+    options: "",
+  },
+  // optional measures
+  {
+    cmit: 969,
+    name: "FASI-1: Identification of Person-Centered Priorities",
+    uid: "969",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.RecordReview,
+    options: "",
+  },
+  {
+    cmit: 970,
+    name: "FASI-2: Documentation of a Person-Centered Service Plan",
+    uid: "970",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
+    dataSource: DataSource.RecordReview,
+    options: "",
+  },
+  {
+    cmit: 111,
+    name: "HCBS-10: Self-direction of Services and Supports Among Medicaid Beneficiaries Receiving LTSS through Managed Care Organizations",
+    uid: "111",
+    measureSteward: "CMS",
+    measureSpecification: [MeasureSpecification.CMS],
+    deliverySystem: [DeliverySystem.MLTSS],
+    dataSource: DataSource.CaseRecordManagement,
+    options: "",
+  },
   {
     cmit: 963,
     name: "LTSS-3: Shared Person-Centered Plan with Primary Care Provider",
@@ -64,34 +125,4 @@ export const CMIT_LIST: CMIT[] = [
     dataSource: DataSource.Hybrid,
     options: "",
   },
-  {
-    cmit: 20,
-    name: "LTSS-6: Admission to a Facility from the Community",
-    uid: "20",
-    measureSteward: "CMS",
-    measureSpecification: [MeasureSpecification.CMS],
-    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
-    dataSource: DataSource.Administrative,
-    options: "",
-  },
-  {
-    cmit: 968,
-    name: "LTSS-7: Minimizing Facility Length of Stay",
-    uid: "968",
-    measureSteward: "CMS",
-    measureSpecification: [MeasureSpecification.CMS],
-    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
-    dataSource: DataSource.Administrative,
-    options: "",
-  },
-  {
-    cmit: 414,
-    name: "LTSS-8: Successful Transition after Long-Term Facility Stay",
-    uid: "414",
-    measureSteward: "CMS",
-    measureSpecification: [MeasureSpecification.CMS],
-    deliverySystem: [DeliverySystem.FFS, DeliverySystem.MLTSS],
-    dataSource: DataSource.Administrative,
-    options: "",
-  },
 ];