diff --git a/services/app-api/forms/naaar.json b/services/app-api/forms/naaar.json
index d90e05acf..4a752be68 100644
--- a/services/app-api/forms/naaar.json
+++ b/services/app-api/forms/naaar.json
@@ -290,7 +290,25 @@
             "deleteModalTitle": "Are you sure you want to delete this analysis method?",
             "deleteModalConfirmButtonText": "Yes, delete method",
             "deleteModalWarning": "Are you sure you want to proceed? You will lose all information entered for this analysis method in the NAAAR. The method will remain in previously submitted NAAAR reports if applicable.",
-            "drawerTitle": "Analysis method: "
+            "drawerTitle": "Analysis method: ",
+            "missingEntityMessage": [
+              {
+                "type": "p",
+                "children": [
+                  {
+                    "type": "html",
+                    "content": "This program is missing plans. You won’t be able to complete this section until you’ve added all the plans that participate in this program in section A.7. "
+                  },
+                  {
+                    "type": "internalLink",
+                    "content": "Add Plans",
+                    "props": {
+                      "to": "/naaar/state-and-program-information/add-plans"
+                    }
+                  }
+                ]
+              }
+            ]
           },
           "drawerForm": {
             "id": "iam",
@@ -374,23 +392,14 @@
                           "validation": {
                             "type": "checkbox",
                             "nested": true,
-                            "parentFieldName": "analysis_applicable"
+                            "parentFieldName": "analysis_applicable",
+                            "parentOptionId": "analysis_applicable-Br7jPULxsYgbiuHV9zwyIB"
                           },
                           "props": {
                             "label": "Plans utilizing this method",
                             "choices": [
                               {
-                                "id": "tvCUw5CcaGUFSIMByAopjF",
-                                "label": "Fill in plans here"
-                              },
-                              {
-                                "id": "tvCUw5CcaGUFSIMByAopjA",
-                                "label": "Second plan"
-                              }
-                              ,
-                              {
-                                "id": "tvCUw5CcaGUFSIMByAopjB",
-                                "label": "Third plan with the absolutest most longest name you ever did see in a plan like this one"
+                                "label": "Plans"
                               }
                             ]
                           }
@@ -484,25 +493,13 @@
                 "id": "analysis_method_applicable_plans",
                 "type": "checkbox",
                 "validation": {
-                  "type": "checkbox",
-                  "nested": true,
-                  "parentFieldName": "analysis_applicable"
+                  "type": "checkbox"
                 },
                 "props": {
                   "label": "Plans utilizing this method",
                   "choices": [
                     {
-                      "id": "tvCUw5CcaGUFSIMByAopjF",
-                      "label": "Fill in plans here"
-                    },
-                    {
-                      "id": "tvCUw5CcaGUFSIMByAopjA",
-                      "label": "Second plan"
-                    }
-                    ,
-                    {
-                      "id": "tvCUw5CcaGUFSIMByAopjB",
-                      "label": "Third plan with the absolutest most longest name you ever did see in a plan like this one"
+                      "label": "Plans"
                     }
                   ]
                 }
diff --git a/services/app-api/utils/types/formFields.ts b/services/app-api/utils/types/formFields.ts
index 28122b2af..d084d9430 100644
--- a/services/app-api/utils/types/formFields.ts
+++ b/services/app-api/utils/types/formFields.ts
@@ -20,7 +20,6 @@ export const entityTypes = [
 /**
  * This type is a string union type generated by the constant above.
  */
-export declare type EntityType = typeof entityTypes[number];
 
 export enum ModalDrawerEntityTypes {
   ACCESS_MEASURES = "accessMeasures",
@@ -77,6 +76,7 @@ export type FieldValidationObject =
   | NestedDependentFieldValidation;
 
 export interface FormField {
+  [x: string]: any;
   id: string;
   type: string;
   validation: string | FieldValidationObject;
diff --git a/services/ui-src/src/components/drawers/Drawer.tsx b/services/ui-src/src/components/drawers/Drawer.tsx
index 81235fa3b..f0305444b 100644
--- a/services/ui-src/src/components/drawers/Drawer.tsx
+++ b/services/ui-src/src/components/drawers/Drawer.tsx
@@ -27,6 +27,7 @@ export const Drawer = ({
 }: Props) => {
   const mqClasses = makeMediaQueryClasses();
   const { isOpen, onClose } = drawerDisclosure;
+
   return (
     <ChakraDrawer
       isOpen={isOpen}
diff --git a/services/ui-src/src/components/reports/DrawerReportPage.test.tsx b/services/ui-src/src/components/reports/DrawerReportPage.test.tsx
index bd75239d2..cb150b81d 100644
--- a/services/ui-src/src/components/reports/DrawerReportPage.test.tsx
+++ b/services/ui-src/src/components/reports/DrawerReportPage.test.tsx
@@ -18,6 +18,7 @@ import {
   mockDrawerForm,
   mockNaaarReportStore,
   mockNaaarReportContext,
+  mockNaaarAnalysisMethodsPageJson,
 } from "utils/testing/setupJest";
 // constants
 import { DEFAULT_ANALYSIS_METHODS, saveAndCloseText } from "../../constants";
@@ -327,44 +328,6 @@ describe("Test DrawerReportPage with custom entities", () => {
     setEntityType: () => {},
     setEntities: () => {},
   };
-  const mockAnalysisMethodsReportPageJson = {
-    name: "mock-route",
-    path: "/naaar/analysis-methods",
-    pageType: "drawer",
-    entityType: "analysisMethods",
-    verbiage: {
-      intro: mockVerbiageIntro,
-      dashboardTitle: "Mock dashboard title",
-      drawerTitle: "Mock drawer title",
-      addEntityButtonText: "Add other analysis method",
-    },
-    drawerForm: {
-      id: "am",
-      fields: [
-        {
-          id: "am_default_text",
-          type: "text",
-          validation: "text",
-          props: {
-            label: "Fill in info on analysis method",
-          },
-        },
-      ],
-    },
-    addEntityDrawerForm: {
-      id: "am_custom",
-      fields: [
-        {
-          id: "am_custom_text",
-          type: "text",
-          validation: "text",
-          props: {
-            label: "Fill in info on custom analysis method",
-          },
-        },
-      ],
-    },
-  };
 
   const mockNaaarReportContextWithAnalysisMethods: any = mockNaaarReportContext;
   mockNaaarReportContextWithAnalysisMethods.report.fieldData[
@@ -379,7 +342,7 @@ describe("Test DrawerReportPage with custom entities", () => {
   const drawerReportPageWithCustomEntities = (
     <RouterWrappedComponent>
       <ReportContext.Provider value={mockNaaarReportContextWithAnalysisMethods}>
-        <DrawerReportPage route={mockAnalysisMethodsReportPageJson} />
+        <DrawerReportPage route={mockNaaarAnalysisMethodsPageJson} />
       </ReportContext.Provider>
     </RouterWrappedComponent>
   );
@@ -394,9 +357,7 @@ describe("Test DrawerReportPage with custom entities", () => {
     const enterDefaultMethod = screen.getAllByText("Enter")[0];
     await userEvent.click(enterDefaultMethod);
     expect(screen.getByRole("dialog")).toBeVisible();
-    const textField = await screen.getByLabelText(
-      "Fill in info on analysis method"
-    );
+    const textField = await screen.getByLabelText("mock label 1");
     expect(textField).toBeVisible();
   });
 
@@ -414,9 +375,7 @@ describe("Test DrawerReportPage with custom entities", () => {
     const addCustomMethod = screen.getByText("Add other analysis method");
     await userEvent.click(addCustomMethod);
     expect(screen.getByRole("dialog")).toBeVisible();
-    const customTextField = await screen.getByLabelText(
-      "Fill in info on custom analysis method"
-    );
+    const customTextField = await screen.getByLabelText("Analysis method");
     expect(customTextField).toBeVisible();
     await userEvent.type(customTextField, "new analysis method");
     const saveCustomMethod = screen.getByText("Save & close");
@@ -455,7 +414,7 @@ describe("Test DrawerReportPage with custom entities", () => {
         <ReportContext.Provider
           value={mockNaaarReportContextWithCustomAnalysisMethods}
         >
-          <DrawerReportPage route={mockAnalysisMethodsReportPageJson} />
+          <DrawerReportPage route={mockNaaarAnalysisMethodsPageJson} />
         </ReportContext.Provider>
       </RouterWrappedComponent>
     );
diff --git a/services/ui-src/src/components/reports/DrawerReportPage.tsx b/services/ui-src/src/components/reports/DrawerReportPage.tsx
index 7e77e546c..3ebb2d679 100644
--- a/services/ui-src/src/components/reports/DrawerReportPage.tsx
+++ b/services/ui-src/src/components/reports/DrawerReportPage.tsx
@@ -21,7 +21,6 @@ import {
 import {
   entityWasUpdated,
   filterFormData,
-  generateIlosFields,
   isIlosCompleted,
   getEntriesToClear,
   parseCustomHtml,
@@ -38,12 +37,17 @@ import {
   FormField,
   isFieldElement,
   InputChangeEvent,
+  ReportType,
   FormJson,
 } from "types";
 // assets
 import addIcon from "assets/icons/icon_add_blue.png";
 import completedIcon from "assets/icons/icon_check_circle.png";
 import unfinishedIcon from "assets/icons/icon_error_circle_bright.png";
+import {
+  generateAddEntityDrawerItemFields,
+  generateDrawerItemFields,
+} from "utils/forms/dynamicItemFields";
 
 export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
   const [submitting, setSubmitting] = useState<boolean>(false);
@@ -63,14 +67,42 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
 
   // check if there are ILOS and associated plans
   const isMcparReport = route.path.includes("mcpar");
+  const isAnalysisMethodsPage = route.path.includes("analysis-methods");
   const reportingOnIlos = route.path === "/mcpar/plan-level-indicators/ilos";
   const ilos = report?.fieldData?.["ilos"];
   const hasIlos = ilos?.length;
   const hasPlans = report?.fieldData?.["plans"]?.length > 0;
+  const plans = report?.fieldData?.plans?.map((plan: { name: string }) => plan);
 
-  // generate ILOS fields (if applicable)
-  const form =
-    ilos && reportingOnIlos ? generateIlosFields(drawerForm, ilos) : drawerForm;
+  const getForm = (
+    reportType?: string,
+    isCustomEntityForm: boolean = false
+  ) => {
+    let modifiedForm = drawerForm;
+    switch (reportType) {
+      case ReportType.NAAAR:
+        if (isAnalysisMethodsPage && hasPlans) {
+          modifiedForm = isCustomEntityForm
+            ? generateAddEntityDrawerItemFields(
+                addEntityDrawerForm,
+                plans,
+                "plan"
+              )
+            : generateDrawerItemFields(drawerForm, plans, "plan");
+        }
+        break;
+      case ReportType.MCPAR:
+        if (ilos && reportingOnIlos) {
+          modifiedForm = generateDrawerItemFields(drawerForm, ilos, "ilos");
+        }
+        break;
+      default:
+    }
+    return modifiedForm;
+  };
+
+  const form = getForm(report?.reportType);
+  const addEntityForm = getForm(report?.reportType, true);
 
   // on load, get reporting status from store
   const reportingOnPriorAuthorization =
@@ -121,7 +153,7 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
       }
       let referenceForm = form;
       if (selectedIsCustomEntity) {
-        referenceForm = addEntityDrawerForm;
+        referenceForm = addEntityForm;
       }
       const filteredFormData = filterFormData(
         enteredData,
@@ -181,7 +213,8 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
       (route.path === "/mcpar/plan-level-indicators/prior-authorization" &&
         priorAuthDisabled) ||
       (route.path === "/mcpar/plan-level-indicators/patient-access-api" &&
-        patientAccessDisabled)
+        patientAccessDisabled) ||
+      (isAnalysisMethodsPage && !hasPlans)
     ) {
       style = sx.disabledButton;
       disabled = true;
@@ -206,7 +239,7 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
       const calculateEntityCompletion = () => {
         let formFields = form.fields;
         if (isCustomEntity) {
-          formFields = addEntityDrawerForm.fields;
+          formFields = addEntityForm.fields;
         }
         return formFields
           ?.filter(isFieldElement)
@@ -292,6 +325,11 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
           {parseCustomHtml(verbiage.missingIlosMessage || "")}
         </Box>
       )}
+      {isAnalysisMethodsPage && !hasPlans && (
+        <Box sx={sx.missingIlos}>
+          {parseCustomHtml(verbiage.missingEntityMessage || "")}
+        </Box>
+      )}
       {standardForm && (
         <Box sx={sx.standardForm}>
           <Form
@@ -324,7 +362,7 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
         ) : (
           entityRows(entities)
         )}
-        {canAddEntities && (
+        {canAddEntities && hasPlans && (
           <Button
             variant={"outline"}
             sx={sx.bottomAddEntityButton}
@@ -341,7 +379,7 @@ export const DrawerReportPage = ({ route, validateOnRender }: Props) => {
           drawerTitle: getDrawerTitle(),
           drawerInfo: verbiage.drawerInfo,
         }}
-        form={selectedIsCustomEntity ? addEntityDrawerForm : form}
+        form={selectedIsCustomEntity ? addEntityForm : form}
         onSubmit={onSubmit}
         submitting={submitting}
         drawerDisclosure={{
diff --git a/services/ui-src/src/types/formFields.ts b/services/ui-src/src/types/formFields.ts
index 0391a6850..de682364c 100644
--- a/services/ui-src/src/types/formFields.ts
+++ b/services/ui-src/src/types/formFields.ts
@@ -118,6 +118,7 @@ export interface ChoiceFieldProps {
 export interface Choice {
   key: string; // choice.name
   value: string; // choice.value
+  id?: string; // choice.id
 }
 
 export interface DropdownChoice {
diff --git a/services/ui-src/src/utils/forms/dynamicItemFields.test.ts b/services/ui-src/src/utils/forms/dynamicItemFields.test.ts
new file mode 100644
index 000000000..d08d5b9a7
--- /dev/null
+++ b/services/ui-src/src/utils/forms/dynamicItemFields.test.ts
@@ -0,0 +1,109 @@
+import { FormJson, AnyObject } from "types";
+import { mockNaaarAnalysisMethodsPageJson } from "utils/testing/mockForm";
+import {
+  generateAddEntityDrawerItemFields,
+  generateDrawerItemFields,
+} from "./dynamicItemFields";
+
+const mockIlosForm: FormJson = {
+  id: "mock-id",
+  fields: [
+    {
+      id: "mock-field-id",
+      props: {
+        choices: [
+          {
+            id: "mock-choice-id-1",
+            label: "mock label 1",
+          },
+          {
+            id: "mock-choice-id-2",
+            label: "mock label 2",
+            children: [
+              {
+                id: "mock-child-id",
+                type: "checkbox",
+                validation: {
+                  type: "checkbox",
+                  nested: true,
+                  parentFieldName: "mock-field-id",
+                  parentOptionId: "mock-field-id-mock-choice-id-2",
+                },
+                props: {
+                  choices: [],
+                },
+              },
+            ],
+          },
+        ],
+      },
+      type: "radio",
+      validation: "radio",
+    },
+  ],
+};
+
+const mockAnalysisMethodsForm: FormJson =
+  mockNaaarAnalysisMethodsPageJson.drawerForm;
+const mockAddAnalysisMethodsForm: FormJson =
+  mockNaaarAnalysisMethodsPageJson.addEntityDrawerForm;
+
+const mockIlos: AnyObject[] = [
+  {
+    id: "mock-ilos-1",
+    name: "ilos 1",
+  },
+  {
+    id: "mock-ilos-2",
+    name: "ilos 2",
+  },
+];
+
+const mockPlans: AnyObject[] = [
+  {
+    id: "mock-plan-1",
+    name: "Plan 1",
+  },
+  {
+    id: "mock-plan-2",
+    name: "Plan 2",
+  },
+];
+
+describe("generateDrawerItemFields for ILOS", () => {
+  const result = generateDrawerItemFields(mockIlosForm, mockIlos, "ilos");
+  it("should generate checkboxes per each available ILOS", () => {
+    expect(result.fields[0].props.choices.length).toBe(2);
+  });
+
+  it("each ILOS checkbox should have a nested text field of type number", () => {
+    result.fields[0].props.choices[1].children[0].props.choices.map(
+      (choice: AnyObject) => {
+        expect(choice.children);
+        expect(choice.children[0].type).toBe("number");
+      }
+    );
+  });
+});
+
+describe("generateDrawerItemFields for NAAAR analysis methods without custom entity form", () => {
+  const result = generateDrawerItemFields(
+    mockAnalysisMethodsForm,
+    mockPlans,
+    "plan"
+  );
+  it("should generate checkboxes per each available plan", () => {
+    expect(result.fields[0].props.choices[1].children.length).toBe(2);
+  });
+});
+
+describe("generateAddEntityDrawerItemFields for NAAAR analysis methods with custom entity form", () => {
+  const result = generateAddEntityDrawerItemFields(
+    mockAddAnalysisMethodsForm,
+    mockPlans,
+    "plan"
+  );
+  it("should generate checkboxes per each available plan", () => {
+    expect(result.fields[3].props?.choices.length).toBe(2);
+  });
+});
diff --git a/services/ui-src/src/utils/forms/dynamicItemFields.ts b/services/ui-src/src/utils/forms/dynamicItemFields.ts
new file mode 100644
index 000000000..aed2b9153
--- /dev/null
+++ b/services/ui-src/src/utils/forms/dynamicItemFields.ts
@@ -0,0 +1,124 @@
+import { AnyObject, FormJson } from "types";
+
+// first attempt to combine ilos and plans functions
+
+export const generateDrawerItemFields = (
+  form: FormJson,
+  items: AnyObject[],
+  entityType: string
+) => {
+  const fields = form.fields[0];
+  return {
+    ...form,
+    fields: [
+      {
+        ...form.fields[0],
+        props: {
+          ...form.fields[0].props,
+          choices: [
+            ...updatedItemChoiceList(
+              fields.props?.choices,
+              availableItems(items, entityType),
+              entityType
+            ),
+          ],
+        },
+      },
+    ],
+  };
+};
+
+export const generateAddEntityDrawerItemFields = (
+  form: FormJson,
+  items: AnyObject[],
+  entityType: string
+) => {
+  form.fields[3] = {
+    ...form.fields[3],
+    props: {
+      ...form.fields[3].props,
+      choices: [...availableItems(items, entityType)],
+    },
+  };
+  return form;
+};
+
+const availableItems = (items: AnyObject[], entityType: string) => {
+  const ilosFieldName = "plan_ilosUtilizationByPlan";
+  const updatedItemChoices: AnyObject[] = [];
+  items.forEach((item) => {
+    updatedItemChoices.push({
+      ...item,
+      label: item.name,
+      checked: false,
+      ...(entityType === "ilos" && {
+        children: [
+          {
+            id: `${ilosFieldName}_${item.id}`,
+            type: "number",
+            validation: {
+              type: "number",
+              nested: true,
+              parentFieldName: `${ilosFieldName}`,
+              parentOptionId: item.id,
+            },
+            props: {
+              decimalPlacesToRoundTo: 0,
+            },
+          },
+        ],
+      }),
+    });
+  });
+  return updatedItemChoices;
+};
+
+const updatedItemChoiceList = (
+  choices: AnyObject[],
+  itemChoices: AnyObject[],
+  entityType: string
+) => {
+  const updatedChoiceList: AnyObject[] = [];
+  if (entityType === "plan") {
+    choices.map((choice: AnyObject) => {
+      updatedChoiceList.push(
+        choice.children
+          ? {
+              ...choice,
+              children: [
+                choice.children[0],
+                {
+                  ...choice.children[1],
+                  props: {
+                    ...choice.children[1].props,
+                    choices: [...itemChoices],
+                  },
+                },
+              ],
+            }
+          : { ...choice }
+      );
+    });
+  } else {
+    choices.map((choice: AnyObject) => {
+      updatedChoiceList.push(
+        choice.children
+          ? {
+              ...choice,
+              children: [
+                {
+                  ...choice.children[0],
+                  props: {
+                    ...choice.children[0].props,
+                    choices: [...itemChoices],
+                  },
+                },
+              ],
+            }
+          : { ...choice }
+      );
+    });
+  }
+
+  return updatedChoiceList;
+};
diff --git a/services/ui-src/src/utils/forms/ilosFields.test.ts b/services/ui-src/src/utils/forms/ilosFields.test.ts
index 2423c30aa..dda87d28a 100644
--- a/services/ui-src/src/utils/forms/ilosFields.test.ts
+++ b/services/ui-src/src/utils/forms/ilosFields.test.ts
@@ -1,54 +1,5 @@
-import { generateIlosFields, isIlosCompleted } from "utils";
-import { FormJson, AnyObject, EntityShape } from "types";
-
-const mockForm: FormJson = {
-  id: "mock-id",
-  fields: [
-    {
-      id: "mock-field-id",
-      props: {
-        choices: [
-          {
-            id: "mock-choice-id-1",
-            label: "mock label 1",
-          },
-          {
-            id: "mock-choice-id-2",
-            label: "mock label 2",
-            children: [
-              {
-                id: "mock-child-id",
-                type: "checkbox",
-                validation: {
-                  type: "checkbox",
-                  nested: true,
-                  parentFieldName: "mock-field-id",
-                  parentOptionId: "mock-field-id-mock-choice-id-2",
-                },
-                props: {
-                  choices: [],
-                },
-              },
-            ],
-          },
-        ],
-      },
-      type: "radio",
-      validation: "radio",
-    },
-  ],
-};
-
-const mockIlos: AnyObject[] = [
-  {
-    id: "mock-ilos-1",
-    name: "ilos 1",
-  },
-  {
-    id: "mock-ilos-2",
-    name: "ilos 2",
-  },
-];
+import { isIlosCompleted } from "utils";
+import { EntityShape } from "types";
 
 const mockCompleteIlosEntity: EntityShape = {
   id: "mock-complete-ilos",
@@ -70,22 +21,6 @@ const mockIncompleteIlosEntity: EntityShape = {
   id: "mock-incomplete-ilos",
 };
 
-describe("generateIlosFields", () => {
-  const result = generateIlosFields(mockForm, mockIlos);
-  it("should generate checkboxes per each available ILOS", () => {
-    expect(result.fields[0].props.choices.length).toBe(2);
-  });
-
-  it("each ILOS checkbox should have a nested text field of type number", () => {
-    result.fields[0].props.choices[1].children[0].props.choices.map(
-      (choice: AnyObject) => {
-        expect(choice.children);
-        expect(choice.children[0].type).toBe("number");
-      }
-    );
-  });
-});
-
 describe("isIlosCompleted", () => {
   it("should return TRUE if entity is complete", () => {
     const result = isIlosCompleted(true, mockCompleteIlosEntity);
diff --git a/services/ui-src/src/utils/forms/ilosFields.ts b/services/ui-src/src/utils/forms/ilosFields.ts
index f7bfd0ed1..e7d3a5dac 100644
--- a/services/ui-src/src/utils/forms/ilosFields.ts
+++ b/services/ui-src/src/utils/forms/ilosFields.ts
@@ -1,78 +1,4 @@
-import { AnyObject, EntityShape, FormJson } from "types";
-
-export const generateIlosFields = (form: FormJson, ilos: AnyObject[]) => {
-  const fields = form.fields[0];
-  return {
-    ...form,
-    fields: [
-      {
-        ...form.fields[0],
-        props: {
-          ...form.fields[0].props,
-          choices: [
-            ...updatedIlosChoiceList(
-              fields.props?.choices,
-              availableIlos(ilos)
-            ),
-          ],
-        },
-      },
-    ],
-  };
-};
-
-const availableIlos = (ilos: AnyObject[]) => {
-  const updatedIlosChoices: AnyObject[] = [];
-  ilos.forEach((item) => {
-    updatedIlosChoices.push({
-      ...item,
-      label: item.name,
-      checked: false,
-      children: [
-        {
-          id: `plan_ilosUtilizationByPlan_${item.id}`,
-          type: "number",
-          validation: {
-            type: "number",
-            nested: true,
-            parentFieldName: "plan_ilosUtilizationByPlan",
-            parentOptionId: item.id,
-          },
-          props: {
-            decimalPlacesToRoundTo: 0,
-          },
-        },
-      ],
-    });
-  });
-  return updatedIlosChoices;
-};
-
-const updatedIlosChoiceList = (
-  choices: AnyObject[],
-  ilosChoices: AnyObject[]
-) => {
-  const updatedChoiceList: AnyObject[] = [];
-  choices.map((choice: AnyObject) => {
-    updatedChoiceList.push(
-      choice.children
-        ? {
-            ...choice,
-            children: [
-              {
-                ...choice.children[0],
-                props: {
-                  ...choice.children[0].props,
-                  choices: [...ilosChoices],
-                },
-              },
-            ],
-          }
-        : { ...choice }
-    );
-  });
-  return updatedChoiceList;
-};
+import { EntityShape } from "types";
 
 // if reporting on ILOS, verify that its questions are completed
 export const isIlosCompleted = (
diff --git a/services/ui-src/src/utils/testing/mockForm.tsx b/services/ui-src/src/utils/testing/mockForm.tsx
index 0b4e502cc..4e6eb402f 100644
--- a/services/ui-src/src/utils/testing/mockForm.tsx
+++ b/services/ui-src/src/utils/testing/mockForm.tsx
@@ -243,6 +243,111 @@ export const mockNestedReportPageJson = {
   drawerForm: mockNestedForm,
 };
 
+export const mockNaaarAnalysisMethodsPageJson = {
+  name: "mock-route",
+  path: "/naaar/analysis-methods",
+  pageType: "drawer",
+  entityType: "analysisMethods",
+  verbiage: {
+    intro: mockVerbiageIntro,
+    dashboardTitle: "Mock dashboard title",
+    drawerTitle: "Mock drawer title",
+    addEntityButtonText: "Add other analysis method",
+  },
+  drawerForm: {
+    id: "am",
+    fields: [
+      {
+        id: "mock-field-id",
+        props: {
+          choices: [
+            {
+              id: "mock-choice-id-1",
+              label: "mock label 1",
+            },
+            {
+              id: "mock-choice-id-2",
+              label: "mock label 2",
+              children: [
+                {
+                  id: "mock-child-id-0",
+                  type: "radio",
+                  validation: {
+                    type: "radio",
+                    nested: true,
+                    parentFieldName: "analysis_applicable",
+                  },
+                  props: {
+                    label: "Frequency of analysis",
+                    choices: [],
+                  },
+                },
+                {
+                  id: "mock-child-id-1",
+                  type: "checkbox",
+                  validation: {
+                    type: "radio",
+                    nested: true,
+                    parentFieldName: "mock-field-id",
+                    parentOptionId: "mock-field-id-mock-choice-id-1",
+                  },
+                  props: {
+                    label: "Plans utilizing this method",
+                    choices: [],
+                  },
+                },
+              ],
+            },
+          ],
+        },
+        type: "radio",
+        validation: "radio",
+      },
+    ],
+  },
+  addEntityDrawerForm: {
+    id: "am_custom",
+    fields: [
+      {
+        id: "mock_custom_analysis_method_name",
+        type: "text",
+        validation: "text",
+        props: {
+          label: "Analysis method",
+        },
+      },
+      {
+        id: "mock_custom_analysis_method_description",
+        type: "textarea",
+        validation: "textarea",
+        props: {
+          label: "description",
+        },
+      },
+      {
+        id: "mock_analysis_method_frequency",
+        type: "radio",
+        props: {
+          label: "Frequency of analysis",
+          choices: [],
+        },
+      },
+      {
+        id: "mock_analysis_method_applicable_plans",
+        type: "checkbox",
+        props: {
+          label: "Plans utilizing this method",
+          choices: [
+            {
+              label: "Plans",
+            },
+          ],
+        },
+      },
+    ],
+  },
+};
+
 export const mockModalDrawerReportPageVerbiage = {
   intro: mockVerbiageIntro,
   dashboardTitle: "Mock dashboard title",
diff --git a/services/ui-src/src/utils/testing/mockReport.tsx b/services/ui-src/src/utils/testing/mockReport.tsx
index 4b88724e8..27aa8f28f 100644
--- a/services/ui-src/src/utils/testing/mockReport.tsx
+++ b/services/ui-src/src/utils/testing/mockReport.tsx
@@ -361,6 +361,16 @@ export const mockNaaarReportFieldData = {
   radio: ["option1"],
   checkbox: ["option1", "option2"],
   dropdown: "dropdown-selection",
+  plans: [
+    {
+      id: "id1",
+      name: "plan 1",
+    },
+    {
+      id: "id2",
+      name: "plan 2",
+    },
+  ],
 };
 
 export const mockMcparReport = {