diff --git a/.gitignore b/.gitignore
index 0f41fb70..41dc02f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 _site
 .turbo/
 .vscode/
+.idea/
 coverage/
 html/
 node_modules/
diff --git a/apps/spotlight/src/components/SplashPage.tsx b/apps/spotlight/src/components/SplashPage.tsx
new file mode 100644
index 00000000..0dac27d2
--- /dev/null
+++ b/apps/spotlight/src/components/SplashPage.tsx
@@ -0,0 +1,3 @@
+export default () => {
+  return <h1>Hero</h1>
+}
\ No newline at end of file
diff --git a/packages/common/src/locales/en/app.ts b/packages/common/src/locales/en/app.ts
index fa715580..13815462 100644
--- a/packages/common/src/locales/en/app.ts
+++ b/packages/common/src/locales/en/app.ts
@@ -89,5 +89,10 @@ export const en = {
       hint: 'For example, 555-11-0000',
       errorTextMustContainChar: 'String must contain at least 1 character(s)',
     },
+    repeater: {
+      ...defaults,
+      displayName: 'Repeatable Group',
+      errorTextMustContainChar: 'String must contain at least 1 character(s)',
+    },
   },
 };
diff --git a/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx b/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
index 663302f7..686f8d3b 100644
--- a/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
+++ b/packages/design/src/Form/components/RadioGroup/RadioGroup.tsx
@@ -13,17 +13,20 @@ export const RadioGroupPattern: PatternComponent<RadioGroupProps> = props => {
         {props.legend}
       </legend>
       {props.options.map((option, index) => {
+        const id = props.idSuffix ? `${option.id}${props.idSuffix}` : option.id;
         return (
           <div key={index} className="usa-radio">
             <input
               className="usa-radio__input"
               type="radio"
-              id={option.id}
-              {...register(props.groupId)}
+              id={`input-${id}`}
+              {...register(
+                `${props.groupId}${props.idSuffix ? props.idSuffix : ''}`
+              )}
               value={option.id}
               defaultChecked={option.defaultChecked}
             />
-            <label htmlFor={option.id} className="usa-radio__label">
+            <label htmlFor={`input-${id}`} className="usa-radio__label">
               {option.label}
             </label>
           </div>
diff --git a/packages/design/src/Form/components/Repeater/Repeater.stories.tsx b/packages/design/src/Form/components/Repeater/Repeater.stories.tsx
new file mode 100644
index 00000000..109232f5
--- /dev/null
+++ b/packages/design/src/Form/components/Repeater/Repeater.stories.tsx
@@ -0,0 +1,66 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import React from 'react';
+import Repeater from './index.js';
+import { expect, userEvent } from '@storybook/test';
+import { FormProvider, useForm } from 'react-hook-form';
+
+export default {
+  title: 'patterns/Repeater',
+  component: Repeater,
+  decorators: [
+    (Story, args) => {
+      const FormDecorator = () => {
+        const formMethods = useForm();
+        return (
+          <FormProvider {...formMethods}>
+            <Story {...args} />
+          </FormProvider>
+        );
+      };
+      return <FormDecorator />;
+    },
+  ],
+  tags: ['autodocs'],
+} satisfies Meta<typeof Repeater>;
+
+const defaultArgs = {
+  legend: 'Default Heading',
+  _patternId: 'test-id',
+};
+
+export const Default = {
+  args: {
+    ...defaultArgs,
+    type: 'repeater',
+  },
+} satisfies StoryObj<typeof Repeater>;
+
+export const WithContents = {
+  play: async ({ mount, args }) => {
+    const canvas = await mount(<Repeater {...args} />);
+
+    const addButton = canvas.getByRole('button', { name: /Add new item/ });
+    const deleteButton = canvas.getByRole('button', { name: /Delete item/ });
+    await userEvent.click(addButton);
+
+    let inputs = canvas.queryAllByRole('textbox');
+    await expect(inputs).toHaveLength(1);
+
+    await userEvent.click(deleteButton);
+    inputs = canvas.queryAllByRole('textbox');
+    await expect(inputs).toHaveLength(0);
+  },
+  args: {
+    ...defaultArgs,
+    type: 'repeater',
+    children: [
+      // eslint-disable-next-line
+      <div className="usa-form-group-wrapper">
+        <label className="usa-label" htmlFor="input">
+          Input
+        </label>
+        <input className="usa-input" type="text" id="input" name="input" />
+      </div>,
+    ],
+  },
+} satisfies StoryObj<typeof Repeater>;
diff --git a/packages/design/src/Form/components/Repeater/Repeater.test.tsx b/packages/design/src/Form/components/Repeater/Repeater.test.tsx
new file mode 100644
index 00000000..745c5a9e
--- /dev/null
+++ b/packages/design/src/Form/components/Repeater/Repeater.test.tsx
@@ -0,0 +1,7 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { describeStories } from '../../../test-helper.js';
+import meta, * as stories from './Repeater.stories.js';
+
+describeStories(meta, stories);
diff --git a/packages/design/src/Form/components/Repeater/edit.tsx b/packages/design/src/Form/components/Repeater/edit.tsx
new file mode 100644
index 00000000..b69e09ef
--- /dev/null
+++ b/packages/design/src/Form/components/Repeater/edit.tsx
@@ -0,0 +1,19 @@
+import React from 'react';
+import { type RepeaterProps } from '@atj/forms';
+import { type PatternComponent } from '../../../Form/index.js';
+
+const RepeaterEditView: PatternComponent<RepeaterProps> = props => {
+  return (
+    <fieldset className="usa-fieldset width-full padding-top-2">
+      {props.legend !== '' && props.legend !== undefined && (
+        <legend className="usa-legend text-bold text-uppercase line-height-body-4 width-full margin-top-0 padding-top-3 padding-bottom-1">
+          {props.legend}
+        </legend>
+      )}
+
+      {props.children}
+    </fieldset>
+  );
+};
+
+export default RepeaterEditView;
diff --git a/packages/design/src/Form/components/Repeater/index.tsx b/packages/design/src/Form/components/Repeater/index.tsx
new file mode 100644
index 00000000..afcbd66f
--- /dev/null
+++ b/packages/design/src/Form/components/Repeater/index.tsx
@@ -0,0 +1,110 @@
+import React from 'react';
+import { useFieldArray, useForm } from 'react-hook-form';
+import { type RepeaterProps } from '@atj/forms';
+import { type PatternComponent } from '../../index.js';
+
+const Repeater: PatternComponent<RepeaterProps> = props => {
+  const { control } = useForm();
+
+  const { fields, append, remove } = useFieldArray({
+    control,
+    name: 'fields',
+  });
+
+  const hasFields = React.Children.toArray(props.children).length > 0;
+
+  /**
+   * TODO: we want to have an array of objects so it is grouped correctly when submitted
+   * child components when submitted need to escalate validation logic to the repeater and rows without
+   * any input should not be considered fields that we care about for validation.
+   *
+   * Each row of the repeater should have its own unique index
+   */
+
+  const renderWithUniqueIds = (children: React.ReactNode) => {
+    return React.Children.map(children, child => {
+      if (React.isValidElement(child) && child?.props?.component?.props) {
+        console.group('renderwithuniqueids');
+        console.log(child.props);
+        console.groupEnd();
+        return React.cloneElement(child as React.ReactElement, {
+          component: {
+            ...child.props.component,
+            props: {
+              ...child.props.component.props,
+            },
+          },
+        });
+      }
+      return child;
+    });
+  };
+
+  return (
+    <fieldset className="usa-fieldset width-full padding-top-2">
+      {props.legend && (
+        <legend className="usa-legend text-bold text-uppercase line-height-body-4 width-full margin-top-0 padding-top-3 padding-bottom-1">
+          {props.legend}
+        </legend>
+      )}
+      {hasFields && (
+        <>
+          {fields.length ? (
+            <ul className="add-list-reset margin-bottom-4">
+              {fields.map((field, index) => (
+                <li
+                  key={field.id}
+                  className="padding-bottom-4 border-bottom border-base-lighter"
+                >
+                  {renderWithUniqueIds(props.children, index)}
+                </li>
+              ))}
+            </ul>
+          ) : (
+            <div className="usa-prose bg-accent-cool-lighter padding-1 margin-bottom-2">
+              <p className="margin-top-0">
+                This section is empty. Start by{' '}
+                <button
+                  type="submit"
+                  className="usa-button usa-button--secondary usa-button--unstyled"
+                  onClick={e => {
+                    e.preventDefault();
+                    append({});
+                  }}
+                >
+                  adding an item
+                </button>
+                .
+              </p>
+            </div>
+          )}
+          <div className="usa-button-group margin-bottom-4">
+            <button
+              type="submit"
+              className="usa-button usa-button--outline"
+              onClick={e => {
+                e.preventDefault();
+                append({});
+              }}
+            >
+              Add new item
+            </button>
+            <button
+              type="submit"
+              className="usa-button usa-button--outline"
+              onClick={e => {
+                e.preventDefault();
+                remove(fields.length - 1);
+              }}
+              disabled={fields.length === 0}
+            >
+              Delete item
+            </button>
+          </div>
+        </>
+      )}
+    </fieldset>
+  );
+};
+
+export default Repeater;
diff --git a/packages/design/src/Form/components/SubmissionConfirmation/index.tsx b/packages/design/src/Form/components/SubmissionConfirmation/index.tsx
index 7e422663..19a33255 100644
--- a/packages/design/src/Form/components/SubmissionConfirmation/index.tsx
+++ b/packages/design/src/Form/components/SubmissionConfirmation/index.tsx
@@ -40,30 +40,35 @@ const SubmissionConfirmation: PatternComponent<
             Submission details
           </button>
         </h4>
-        <div
-          id="submission-confirmation-table"
-          className="usa-accordion__content usa-prose"
-          hidden={true}
-        >
-          {/*<table className="usa-table usa-table--striped width-full">*/}
-          {/*  <thead>*/}
-          {/*    <tr>*/}
-          {/*      <th scope="col">Form field</th>*/}
-          {/*      <th scope="col">Provided value</th>*/}
-          {/*    </tr>*/}
-          {/*  </thead>*/}
-          {/*  <tbody>*/}
-          {/*    {props.table.map((row, index) => {*/}
-          {/*      return (*/}
-          {/*        <tr key={index}>*/}
-          {/*          <th scope="row">{row.label}</th>*/}
-          {/*          <td>{row.value}</td>*/}
-          {/*        </tr>*/}
-          {/*      );*/}
-          {/*    })}*/}
-          {/*  </tbody>*/}
-          {/*</table>*/}
-        </div>
+        {/*
+          EG: turn this off for now. Will need some design perhaps to see what the presentation
+          should look like. This was a minimal blocker for the repeater field due to the flat data structure
+          that was there previously.
+        */}
+        {/*<div*/}
+        {/*  id="submission-confirmation-table"*/}
+        {/*  className="usa-accordion__content usa-prose"*/}
+        {/*  hidden={true}*/}
+        {/*>*/}
+        {/*  <table className="usa-table usa-table--striped width-full">*/}
+        {/*    <thead>*/}
+        {/*      <tr>*/}
+        {/*        <th scope="col">Form field</th>*/}
+        {/*        <th scope="col">Provided value</th>*/}
+        {/*      </tr>*/}
+        {/*    </thead>*/}
+        {/*    <tbody>*/}
+        {/*      {props.table.map((row, index) => {*/}
+        {/*        return (*/}
+        {/*          <tr key={index}>*/}
+        {/*            <th scope="row">{row.label}</th>*/}
+        {/*            <td>{row.value}</td>*/}
+        {/*          </tr>*/}
+        {/*        );*/}
+        {/*      })}*/}
+        {/*    </tbody>*/}
+        {/*  </table>*/}
+        {/*</div>*/}
       </div>
     </>
   );
diff --git a/packages/design/src/Form/components/TextInput/index.tsx b/packages/design/src/Form/components/TextInput/index.tsx
index da57726a..1b875902 100644
--- a/packages/design/src/Form/components/TextInput/index.tsx
+++ b/packages/design/src/Form/components/TextInput/index.tsx
@@ -7,6 +7,9 @@ import { type PatternComponent } from '../../../Form/index.js';
 
 const TextInput: PatternComponent<TextInputProps> = props => {
   const { register } = useFormContext();
+  const id = props.idSuffix
+    ? `${props.inputId}${props.idSuffix}`
+    : props.inputId;
   return (
     <div className="usa-form-group-wrapper" key={props.inputId}>
       <div
@@ -18,13 +21,13 @@ const TextInput: PatternComponent<TextInputProps> = props => {
           className={classNames('usa-label', {
             'usa-label--error': props.error,
           })}
-          id={`input-message-${props.inputId}`}
+          id={`input-message-${id}`}
         >
           {props.label}
           {props.error && (
             <span
               className="usa-error-message"
-              id={`input-error-message-${props.inputId}`}
+              id={`input-error-message-${id}`}
               role="alert"
             >
               {props.error.message}
@@ -34,13 +37,13 @@ const TextInput: PatternComponent<TextInputProps> = props => {
             className={classNames('usa-input', {
               'usa-input--error': props.error,
             })}
-            id={`input-${props.inputId}`}
+            id={`input-${id}`}
             defaultValue={props.value}
-            {...register(props.inputId || Math.random().toString(), {
+            {...register(id || Math.random().toString(), {
               //required: props.required,
             })}
             type="text"
-            aria-describedby={`input-message-${props.inputId}`}
+            aria-describedby={`input-message-${id}`}
           />
         </label>
       </div>
diff --git a/packages/design/src/Form/components/index.tsx b/packages/design/src/Form/components/index.tsx
index 1dfb8adc..66e2aca0 100644
--- a/packages/design/src/Form/components/index.tsx
+++ b/packages/design/src/Form/components/index.tsx
@@ -13,6 +13,7 @@ import PageSet from './PageSet/index.js';
 import Paragraph from './Paragraph/index.js';
 import PhoneNumber from './PhoneNumber/index.js';
 import RadioGroup from './RadioGroup/index.js';
+import Repeater from './Repeater/index.js';
 import RichText from './RichText/index.js';
 import Sequence from './Sequence/index.js';
 import SelectDropdown from './SelectDropdown/index.js';
@@ -35,6 +36,7 @@ export const defaultPatternComponents: ComponentForPattern = {
   paragraph: Paragraph as PatternComponent,
   'phone-number': PhoneNumber as PatternComponent,
   'radio-group': RadioGroup as PatternComponent,
+  repeater: Repeater as PatternComponent,
   'rich-text': RichText as PatternComponent,
   'select-dropdown': SelectDropdown as PatternComponent,
   sequence: Sequence as PatternComponent,
diff --git a/packages/design/src/FormManager/FormEdit/AddPatternDropdown.tsx b/packages/design/src/FormManager/FormEdit/AddPatternDropdown.tsx
index d4104e29..856d787a 100644
--- a/packages/design/src/FormManager/FormEdit/AddPatternDropdown.tsx
+++ b/packages/design/src/FormManager/FormEdit/AddPatternDropdown.tsx
@@ -1,9 +1,6 @@
 import React, { useState, useRef, useEffect } from 'react';
-
 import { defaultFormConfig, type PatternConfig } from '@atj/forms';
-
 import { useFormManagerStore } from '../store.js';
-
 import styles from './formEditStyles.module.css';
 import attachmentIcon from './images/page-icon.svg';
 import blockIcon from './images/block-icon.svg';
@@ -46,9 +43,14 @@ const getIconPath = (iconPath: string) => {
   return Object.values(icons[iconPath])[0] as string;
 };
 
+interface PatternMenuProps {
+  patternSelected: (patternType: string) => void;
+  title: string;
+}
+
 export const AddPatternMenu = () => {
-  const addPage = useFormManagerStore(state => state.addPage);
-  const { addPattern } = useFormManagerStore(state => ({
+  const { addPage, addPattern } = useFormManagerStore(state => ({
+    addPage: state.addPage,
     addPattern: state.addPattern,
   }));
 
@@ -68,25 +70,11 @@ export const AddPatternMenu = () => {
             />
           </li>
           <li className="tablet:grid-col-12 grid-col-5 text-center">
-            <button
-              className={`${styles.dropdownButton} tablet:width-full text-left width-auto text-base-darkest text-normal padding-0 bg-white border-0 cursor-pointer`}
-              onClick={() => {
-                addPage();
-              }}
-            >
-              <span className="tablet:display-inline-block tablet:width-auto tablet:margin-right-1 display-block width-full text-ttop text-center">
-                <img
-                  className="usa-icon"
-                  src={getIconPath('page-icon.svg')}
-                  alt=""
-                  width="24"
-                  height="24"
-                />
-              </span>
-              <span className="display-inline-block text-ttop tablet:width-auto width-9 text-center">
-                Page
-              </span>
-            </button>
+            <MenuItemButton
+              title="Page"
+              onClick={addPage}
+              iconPath="page-icon.svg"
+            />
           </li>
         </ul>
       </div>
@@ -94,6 +82,34 @@ export const AddPatternMenu = () => {
   );
 };
 
+const MenuItemButton = ({
+  title,
+  onClick,
+  iconPath,
+}: {
+  title: string;
+  onClick: () => void;
+  iconPath: string;
+}) => (
+  <button
+    className={`${styles.dropdownButton} tablet:width-full text-left width-auto text-base-darkest text-normal padding-0 bg-white border-0 cursor-pointer`}
+    onClick={onClick}
+  >
+    <span className="tablet:display-inline-block tablet:width-auto tablet:margin-right-1 display-block width-full text-ttop text-center">
+      <img
+        className="usa-icon"
+        src={getIconPath(iconPath)}
+        alt=""
+        width="24"
+        height="24"
+      />
+    </span>
+    <span className="display-inline-block text-ttop tablet:width-auto width-9 text-center">
+      {title}
+    </span>
+  </button>
+);
+
 type DropdownPattern = [string, PatternConfig];
 const sidebarPatterns: DropdownPattern[] = [
   ['checkbox', defaultFormConfig.patterns['checkbox']],
@@ -114,34 +130,15 @@ const sidebarPatterns: DropdownPattern[] = [
     'social-security-number',
     defaultFormConfig.patterns['social-security-number'],
   ],
+  ['repeater', defaultFormConfig.patterns['repeater']],
 ] as const;
-export const fieldsetPatterns: DropdownPattern[] = [
-  ['checkbox', defaultFormConfig.patterns['checkbox']],
-  ['date-of-birth', defaultFormConfig.patterns['date-of-birth']],
-  ['email-input', defaultFormConfig.patterns['email-input']],
-  ['form-summary', defaultFormConfig.patterns['form-summary']],
-  ['input', defaultFormConfig.patterns['input']],
-  ['package-download', defaultFormConfig.patterns['package-download']],
-  ['paragraph', defaultFormConfig.patterns['paragraph']],
-  ['phone-number', defaultFormConfig.patterns['phone-number']],
-  ['radio-group', defaultFormConfig.patterns['radio-group']],
-  ['rich-text', defaultFormConfig.patterns['rich-text']],
-  ['select-dropdown', defaultFormConfig.patterns['select-dropdown']],
-  ['date-of-birth', defaultFormConfig.patterns['date-of-birth']],
-  ['attachment', defaultFormConfig.patterns['attachment']],
-  [
-    'social-security-number',
-    defaultFormConfig.patterns['social-security-number'],
-  ],
-] as const;
+export const compoundFieldChildPatterns: DropdownPattern[] =
+  sidebarPatterns.filter(([key]) => key !== 'fieldset' && key !== 'repeater');
 
 export const SidebarAddPatternMenuItem = ({
   patternSelected,
   title,
-}: {
-  patternSelected: (patternType: string) => void;
-  title: string;
-}) => {
+}: PatternMenuProps) => {
   const [isOpen, setIsOpen] = useState(false);
   const { uswdsRoot } = useFormManagerStore(state => ({
     uswdsRoot: state.context.uswdsRoot,
@@ -170,7 +167,6 @@ export const SidebarAddPatternMenuItem = ({
             <use xlinkHref={`${uswdsRoot}img/sprite.svg#add_circle`}></use>
           </svg>
         </span>
-
         <span className="display-inline-block text-ttop tablet:width-auto text-center">
           <span className="display-inline-block text-ttop margin-right-1 width-9">
             {title}
@@ -188,23 +184,21 @@ export const SidebarAddPatternMenuItem = ({
   );
 };
 
-export const FieldsetAddPatternButton = ({
+export const CompoundAddPatternButton = ({
   patternSelected,
   title,
-}: {
-  patternSelected: (patternType: string) => void;
-  title: string;
-}) => {
+}: PatternMenuProps) => {
   const { uswdsRoot } = useFormManagerStore(state => ({
     uswdsRoot: state.context.uswdsRoot,
   }));
   const [isOpen, setIsOpen] = useState(false);
+
   return (
     <div
       className={classNames(styles.dottedLine, 'margin-top-2 cursor-default')}
     >
       <AddPatternDropdown
-        availablePatterns={fieldsetPatterns}
+        availablePatterns={compoundFieldChildPatterns}
         closeDropdown={() => setIsOpen(false)}
         isOpen={isOpen}
         patternSelected={patternSelected}
@@ -236,17 +230,14 @@ export const FieldsetAddPatternButton = ({
   );
 };
 
-export const FieldsetEmptyStateAddPatternButton = ({
+export const CompoundAddNewPatternButton = ({
   patternSelected,
   title,
-}: {
-  patternSelected: (patternType: string) => void;
-  title: string;
-}) => {
+}: PatternMenuProps) => {
   const [isOpen, setIsOpen] = useState(false);
   return (
     <AddPatternDropdown
-      availablePatterns={fieldsetPatterns}
+      availablePatterns={compoundFieldChildPatterns}
       closeDropdown={() => setIsOpen(false)}
       isOpen={isOpen}
       patternSelected={patternSelected}
diff --git a/packages/design/src/FormManager/FormEdit/components/FieldsetEdit/index.tsx b/packages/design/src/FormManager/FormEdit/components/FieldsetEdit/index.tsx
index 21636baa..6058ef17 100644
--- a/packages/design/src/FormManager/FormEdit/components/FieldsetEdit/index.tsx
+++ b/packages/design/src/FormManager/FormEdit/components/FieldsetEdit/index.tsx
@@ -5,8 +5,8 @@ import { type PatternId, type FieldsetProps } from '@atj/forms';
 import { FieldsetPattern } from '@atj/forms';
 
 import {
-  FieldsetAddPatternButton,
-  FieldsetEmptyStateAddPatternButton,
+  CompoundAddPatternButton,
+  CompoundAddNewPatternButton,
 } from '../../AddPatternDropdown.js';
 import { PatternComponent } from '../../../../Form/index.js';
 import Fieldset from '../../../../Form/components/Fieldset/index.js';
@@ -37,9 +37,9 @@ const FieldsetEdit: PatternEditComponent<FieldsetProps> = ({
 };
 
 const FieldsetPreview: PatternComponent<FieldsetProps> = props => {
-  const { addPatternToFieldset, deletePattern } = useFormManagerStore(
+  const { addPatternToCompoundField, deletePattern } = useFormManagerStore(
     state => ({
-      addPatternToFieldset: state.addPatternToFieldset,
+      addPatternToCompoundField: state.addPatternToCompoundField,
       deletePattern: state.deletePattern,
     })
   );
@@ -61,10 +61,10 @@ const FieldsetPreview: PatternComponent<FieldsetProps> = props => {
                   Empty sections will not display.
                 </span>
                 <span className="action-text add-question display-inline-block margin-right-2">
-                  <FieldsetEmptyStateAddPatternButton
+                  <CompoundAddNewPatternButton
                     title="Add question"
                     patternSelected={patternType =>
-                      addPatternToFieldset(patternType, props._patternId)
+                      addPatternToCompoundField(patternType, props._patternId)
                     }
                   />
                 </span>
@@ -88,10 +88,10 @@ const FieldsetPreview: PatternComponent<FieldsetProps> = props => {
             className="margin-left-3 margin-right-3 margin-bottom-3 bg-none"
           >
             <div className={classNames(styles.usaAlertBody, 'usa-alert__body')}>
-              <FieldsetAddPatternButton
+              <CompoundAddPatternButton
                 title="Add question to fieldset"
                 patternSelected={patternType =>
-                  addPatternToFieldset(patternType, props._patternId)
+                  addPatternToCompoundField(patternType, props._patternId)
                 }
               />
             </div>
diff --git a/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.stories.tsx b/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.stories.tsx
new file mode 100644
index 00000000..ccc65d83
--- /dev/null
+++ b/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.stories.tsx
@@ -0,0 +1,108 @@
+import type { Meta, StoryObj } from '@storybook/react';
+import { expect, userEvent } from '@storybook/test';
+import { within } from '@testing-library/react';
+
+import { enLocale as message } from '@atj/common';
+import { type RepeaterPattern } from '@atj/forms';
+
+import {
+  createPatternEditStoryMeta,
+  testEmptyFormLabelErrorByElement,
+  testUpdateFormFieldOnSubmitByElement,
+} from './common/story-helper.js';
+import FormEdit from '../index.js';
+
+const pattern: RepeaterPattern = {
+  id: '1',
+  type: 'repeater',
+  data: {
+    legend: 'Repeater pattern description',
+    patterns: [],
+  },
+};
+
+const storyConfig: Meta = {
+  title: 'Edit components/RepeaterPattern',
+  ...createPatternEditStoryMeta({
+    pattern,
+  }),
+} as Meta<typeof FormEdit>;
+export default storyConfig;
+
+export const Basic: StoryObj<typeof FormEdit> = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await testUpdateFormFieldOnSubmitByElement(
+      canvasElement,
+      await canvas.findByText('Repeater pattern description'),
+      'Legend Text Element',
+      'Updated repeater pattern'
+    );
+  },
+};
+
+export const Error: StoryObj<typeof FormEdit> = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+    await testEmptyFormLabelErrorByElement(
+      canvasElement,
+      await canvas.findByText('Repeater pattern description'),
+      'Legend Text Element',
+      message.patterns.repeater.errorTextMustContainChar
+    );
+  },
+};
+
+export const AddPattern: StoryObj<typeof FormEdit> = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Add a "short answer" question
+    const addQuestionButton = canvas.getByRole('button', {
+      name: /Add question/,
+    });
+    await userEvent.click(addQuestionButton);
+    const shortAnswerButton = canvas.getByRole('button', {
+      name: /Short answer/,
+    });
+    await userEvent.click(shortAnswerButton);
+
+    // Submit new field's edit form
+    const input = await canvas.findByLabelText('Field label');
+    await userEvent.clear(input);
+    await userEvent.type(input, 'Repeater short question');
+    const form = input?.closest('form');
+    form?.requestSubmit();
+
+    // Confirm that the "short answer" field exists
+    const updatedElement = await canvas.findAllByText(
+      'Repeater short question'
+    );
+    await expect(updatedElement.length).toBeGreaterThan(0);
+  },
+};
+
+export const RemovePattern: StoryObj<typeof FormEdit> = {
+  play: async ({ canvasElement }) => {
+    const canvas = within(canvasElement);
+
+    // Confirm that the expected repeater legend exists
+    expect(
+      canvas.queryAllByRole('group', {
+        name: /Repeater pattern description/i,
+      })
+    ).toHaveLength(1);
+
+    // Add a "short answer" question
+    const removeSectionButton = canvas.getByRole('button', {
+      name: /Remove section/,
+    });
+    await userEvent.click(removeSectionButton);
+
+    // Confirm that the repeater was removed
+    const test = await canvas.queryAllByRole('group', {
+      name: /Repeater pattern description/i,
+    });
+    expect(test).toHaveLength(0);
+  },
+};
diff --git a/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.test.tsx b/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.test.tsx
new file mode 100644
index 00000000..63f795a4
--- /dev/null
+++ b/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.test.tsx
@@ -0,0 +1,7 @@
+/**
+ * @vitest-environment jsdom
+ */
+import { describeStories } from '../../../test-helper.js';
+import meta, * as stories from './RepeaterPatternEdit.stories.js';
+
+describeStories(meta, stories);
diff --git a/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.tsx b/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.tsx
new file mode 100644
index 00000000..e2d542a1
--- /dev/null
+++ b/packages/design/src/FormManager/FormEdit/components/RepeaterPatternEdit.tsx
@@ -0,0 +1,156 @@
+import classNames from 'classnames';
+import React from 'react';
+
+import { type PatternId, type RepeaterProps } from '@atj/forms';
+import { RepeaterPattern } from '@atj/forms';
+
+import {
+  CompoundAddPatternButton,
+  CompoundAddNewPatternButton,
+} from '../AddPatternDropdown.js';
+import { PatternComponent } from '../../../Form/index.js';
+import Repeater from '../../../Form/components/Repeater/index.js';
+import RepeaterEditView from '../../../Form/components/Repeater/edit.js';
+import { useFormManagerStore } from '../../store.js';
+import { PatternEditComponent } from '../types.js';
+
+import { PatternEditActions } from './common/PatternEditActions.js';
+import { PatternEditForm } from './common/PatternEditForm.js';
+import { usePatternEditFormContext } from './common/hooks.js';
+import styles from '../formEditStyles.module.css';
+
+const RepeaterEdit: PatternEditComponent<RepeaterProps> = ({
+  focus,
+  previewProps,
+}) => {
+  return (
+    <>
+      {focus ? (
+        <PatternEditForm
+          pattern={focus.pattern}
+          editComponent={<EditComponent patternId={focus.pattern.id} />}
+        ></PatternEditForm>
+      ) : (
+        <RepeaterPreview {...previewProps} />
+      )}
+    </>
+  );
+};
+
+const RepeaterPreview: PatternComponent<RepeaterProps> = props => {
+  const { addPatternToCompoundField, deletePattern } = useFormManagerStore(
+    state => ({
+      addPatternToCompoundField: state.addPatternToCompoundField,
+      deletePattern: state.deletePattern,
+    })
+  );
+  const pattern = useFormManagerStore(
+    state => state.session.form.patterns[props._patternId]
+  );
+  return (
+    <>
+      <RepeaterEditView {...(props as RepeaterProps)}>
+        {props.children}
+        {pattern && pattern.data.patterns.length === 0 && (
+          <div
+            data-pattern-edit-control="true"
+            className={`${styles.usaAlert} usa-alert usa-alert--warning usa-alert--no-icon margin-left-3 margin-right-3 margin-bottom-3`}
+          >
+            <div className={`${styles.usaAlertBody} usa-alert__body`}>
+              <div className="usa-alert__text">
+                <span className="alert-text display-inline-block text-top margin-right-2">
+                  Empty sections will not display.
+                </span>
+                <span className="action-text add-question display-inline-block margin-right-2">
+                  <CompoundAddNewPatternButton
+                    title="Add question"
+                    patternSelected={patternType =>
+                      addPatternToCompoundField(patternType, props._patternId)
+                    }
+                  />
+                </span>
+                <span className="action-text remove-section display-inline-block text-top margin-right-2">
+                  <button
+                    className="usa-button usa-button--unstyled"
+                    onClick={() => {
+                      deletePattern(pattern.id);
+                    }}
+                  >
+                    Remove section
+                  </button>
+                </span>
+              </div>
+            </div>
+          </div>
+        )}
+        {pattern.data.patterns.length > 0 && (
+          <div
+            data-pattern-edit-control="true"
+            className="margin-left-3 margin-right-3 margin-bottom-3 bg-none"
+          >
+            <div className={classNames(styles.usaAlertBody, 'usa-alert__body')}>
+              <CompoundAddPatternButton
+                title="Add question to repeater"
+                patternSelected={patternType =>
+                  addPatternToCompoundField(patternType, props._patternId)
+                }
+              />
+            </div>
+          </div>
+        )}
+      </RepeaterEditView>
+    </>
+  );
+};
+
+/*
+  TODO: make sure the edit UI can have focus if there is the index of the row. You may need to transform
+  the ID when the component below is mounted.
+ */
+
+const EditComponent = ({ patternId }: { patternId: PatternId }) => {
+  const pattern = useFormManagerStore<RepeaterPattern>(
+    state => state.session.form.patterns[patternId]
+  );
+  const { fieldId, getFieldState, register } =
+    usePatternEditFormContext<RepeaterPattern>(patternId);
+  const legend = getFieldState('legend');
+  return (
+    <div className="grid-row">
+      <div className="grid-col-12 margin-bottom-3 flex-align-self-end">
+        <input
+          type="hidden"
+          {...register('patterns')}
+          defaultValue={pattern.data.patterns}
+        ></input>
+        <label
+          className={classNames('usa-label width-full maxw-full', {
+            'usa-label--error': legend.error,
+          })}
+          htmlFor={fieldId('legend')}
+        >
+          Legend Text Element
+          {legend.error ? (
+            <span className="usa-error-message" role="alert">
+              {legend.error.message}
+            </span>
+          ) : null}
+        </label>
+        <input
+          className={classNames('usa-input bg-primary-lighter text-bold', {
+            'usa-input--error': legend.error,
+          })}
+          id={fieldId('legend')}
+          defaultValue={pattern.data.legend}
+          {...register('legend')}
+          type="text"
+          autoFocus
+        ></input>
+      </div>
+      <Repeater type="repeater" _patternId={patternId} />
+      <PatternEditActions />
+    </div>
+  );
+};
+
+export default RepeaterEdit;
diff --git a/packages/design/src/FormManager/FormEdit/components/common/MovePatternDropdown.tsx b/packages/design/src/FormManager/FormEdit/components/common/MovePatternDropdown.tsx
index da5ecff5..aef52e63 100644
--- a/packages/design/src/FormManager/FormEdit/components/common/MovePatternDropdown.tsx
+++ b/packages/design/src/FormManager/FormEdit/components/common/MovePatternDropdown.tsx
@@ -4,7 +4,7 @@ import styles from '../../formEditStyles.module.css';
 import type { Pattern } from '@atj/forms';
 
 interface MovePatternDropdownProps {
-  isFieldset: boolean;
+  isCompound: boolean;
 }
 
 // Define the extended type for pages
@@ -19,7 +19,7 @@ interface PageWithLabel {
 }
 
 const MovePatternDropdown: React.FC<MovePatternDropdownProps> = ({
-  isFieldset,
+  isCompound,
 }) => {
   const context = useFormManagerStore(state => state.context);
   const [dropdownOpen, setDropdownOpen] = useState(false);
@@ -122,7 +122,7 @@ const MovePatternDropdown: React.FC<MovePatternDropdownProps> = ({
           }}
         >
           <span className="display-inline-block text-ttop">
-            {isFieldset ? 'Move fieldset' : 'Move question'}
+            {isCompound ? 'Move questions' : 'Move question'}
           </span>
           <svg
             className="usa-icon display-inline-block text-ttop"
@@ -189,19 +189,19 @@ const MovePatternDropdown: React.FC<MovePatternDropdownProps> = ({
             <button
               type="button"
               aria-label={
-                isFieldset
-                  ? 'Move fieldset to another page'
+                isCompound
+                  ? 'Move these questions to another page'
                   : 'Move question to another page'
               }
               title={
-                isFieldset
-                  ? 'Move fieldset to another page'
+                isCompound
+                  ? 'Move these questions to another page'
                   : 'Move question to another page'
               }
               className="usa-button margin-right-0"
               onClick={handleMovePattern}
             >
-              {isFieldset ? 'Move fieldset' : 'Move question'}
+              {isCompound ? 'Move fieldset' : 'Move question'}
             </button>
           </p>
         </div>
diff --git a/packages/design/src/FormManager/FormEdit/components/common/PatternEditActions.tsx b/packages/design/src/FormManager/FormEdit/components/common/PatternEditActions.tsx
index 24f91e24..142a3617 100644
--- a/packages/design/src/FormManager/FormEdit/components/common/PatternEditActions.tsx
+++ b/packages/design/src/FormManager/FormEdit/components/common/PatternEditActions.tsx
@@ -23,13 +23,16 @@ export const PatternEditActions = ({ children }: PatternEditActionsProps) => {
     Object.values<Pattern>(state.session.form.patterns)
   );
   const focusPatternId = useFormManagerStore(state => state.focus?.pattern.id);
-  const isPatternInFieldset = useMemo(() => {
+  const isPatternInCompound = useMemo(() => {
     if (!focusPatternId) return false;
     return patterns.some(
-      p => p.type === 'fieldset' && p.data.patterns.includes(focusPatternId)
+      p =>
+        (p.type === 'fieldset' || p.type === 'repeater') &&
+        p.data.patterns.includes(focusPatternId)
     );
   }, [focusPatternId, patterns]);
-  const isFieldset = focusPatternType === 'fieldset';
+  const isCompound =
+    focusPatternType === 'repeater' || focusPatternType === 'fieldset';
   const isPagePattern = focusPatternType === 'page';
   const { copyPattern } = useFormManagerStore(state => ({
     copyPattern: state.copyPattern,
@@ -39,26 +42,26 @@ export const PatternEditActions = ({ children }: PatternEditActionsProps) => {
       p => p.type === 'page'
     )
   );
-  const fieldsets = useFormManagerStore(state =>
+  const compoundFields = useFormManagerStore(state =>
     Object.values<Pattern>(state.session.form.patterns).filter(
-      p => p.type === 'fieldset'
+      p => p.type === 'fieldset' || p.type === 'repeater'
     )
   );
   const handleCopyPattern = () => {
     const currentPageIndex = pages.findIndex(page =>
       page.data.patterns.includes(focusPatternId || '')
     );
-    const currentFieldsetIndex = fieldsets.findIndex(fieldset =>
-      fieldset.data.patterns.includes(focusPatternId)
+    const compoundFieldIndex = compoundFields.findIndex(compoundField =>
+      compoundField.data.patterns.includes(focusPatternId)
     );
     const sourcePagePatternId = pages[currentPageIndex]?.id;
-    const sourceFieldsetPatternId = fieldsets[currentFieldsetIndex]?.id;
+    const sourceCompoundFieldPatternId = compoundFields[compoundFieldIndex]?.id;
 
     if (focusPatternId) {
       if (sourcePagePatternId) {
         copyPattern(sourcePagePatternId, focusPatternId);
       } else {
-        copyPattern(sourceFieldsetPatternId, focusPatternId);
+        copyPattern(sourceCompoundFieldPatternId, focusPatternId);
       }
     }
   };
@@ -77,8 +80,8 @@ export const PatternEditActions = ({ children }: PatternEditActionsProps) => {
           }
         )}
       >
-        {!isPatternInFieldset && !isPagePattern && (
-          <MovePatternDropdown isFieldset={isFieldset} />
+        {!isPatternInCompound && !isPagePattern && (
+          <MovePatternDropdown isCompound={isCompound} />
         )}
         <span
           className={`${styles.patternActionButtons} margin-top-1 margin-bottom-1 display-inline-block text-ttop`}
diff --git a/packages/design/src/FormManager/FormEdit/components/index.ts b/packages/design/src/FormManager/FormEdit/components/index.ts
index a7e33aca..823691b8 100644
--- a/packages/design/src/FormManager/FormEdit/components/index.ts
+++ b/packages/design/src/FormManager/FormEdit/components/index.ts
@@ -17,6 +17,7 @@ import ParagraphPatternEdit from './ParagraphPatternEdit/index.js';
 import { PatternPreviewSequence } from './PreviewSequencePattern/index.js';
 import PhoneNumberPatternEdit from './PhoneNumberPatternEdit/index.js';
 import RadioGroupPatternEdit from './RadioGroupPatternEdit/index.js';
+import RepeaterPatternEdit from './RepeaterPatternEdit.js';
 import RichTextPatternEdit from './RichTextPatternEdit/index.js';
 import SelectDropdownPatternEdit from './SelectDropdownPatternEdit/index.js';
 import SocialSecurityNumberPatternEdit from './SocialSecurityNumberPatternEdit/index.js';
@@ -36,6 +37,7 @@ export const defaultPatternEditComponents: EditComponentForPattern = {
   paragraph: ParagraphPatternEdit as PatternEditComponent,
   'phone-number': PhoneNumberPatternEdit as PatternEditComponent,
   'radio-group': RadioGroupPatternEdit as PatternEditComponent,
+  repeater: RepeaterPatternEdit as PatternEditComponent,
   'rich-text': RichTextPatternEdit as PatternEditComponent,
   'select-dropdown': SelectDropdownPatternEdit as PatternEditComponent,
   sequence: PatternPreviewSequence as PatternEditComponent,
diff --git a/packages/design/src/FormManager/FormEdit/store.ts b/packages/design/src/FormManager/FormEdit/store.ts
index e35b4690..411d695f 100644
--- a/packages/design/src/FormManager/FormEdit/store.ts
+++ b/packages/design/src/FormManager/FormEdit/store.ts
@@ -25,7 +25,10 @@ export type FormEditSlice = {
 
   addPage: () => void;
   addPattern: (patternType: string) => void;
-  addPatternToFieldset: (patternType: string, targetPattern: PatternId) => void;
+  addPatternToCompoundField: (
+    patternType: string,
+    targetPattern: PatternId
+  ) => void;
   clearFocus: () => void;
   copyPattern: (parentPatternId: PatternId, patternId: PatternId) => void;
   deletePattern: (id: PatternId) => void;
@@ -118,25 +121,30 @@ export const createFormEditSlice =
       });
       state.addNotification('success', 'Element copied successfully.');
     },
-
-    addPatternToFieldset: (patternType, targetPattern) => {
+    addPatternToCompoundField: (patternType, targetPattern) => {
       const state = get();
       const builder = new BlueprintBuilder(
         state.context.config,
         state.session.form
       );
-      const newPattern = builder.addPatternToFieldset(
-        patternType,
-        targetPattern
-      );
-      set({
-        session: mergeSession(state.session, { form: builder.form }),
-        focus: { pattern: newPattern },
-      });
-      state.addNotification(
-        'success',
-        'Element added to fieldset successfully.'
-      );
+      const targetPatternType = builder.getPatternTypeById(targetPattern);
+      if (['fieldset', 'repeater'].includes(targetPatternType)) {
+        let newPattern: Pattern;
+        if (targetPatternType === 'fieldset') {
+          newPattern = builder.addPatternToFieldset(patternType, targetPattern);
+        } else {
+          newPattern = builder.addPatternToRepeater(patternType, targetPattern);
+        }
+
+        set({
+          session: mergeSession(state.session, { form: builder.form }),
+          focus: { pattern: newPattern },
+        });
+        state.addNotification(
+          'success',
+          `Element added to ${targetPatternType} successfully.`
+        );
+      }
     },
     clearFocus: () => {
       set({ focus: undefined });
diff --git a/packages/forms/src/blueprint.ts b/packages/forms/src/blueprint.ts
index 4bcfae75..442e8334 100644
--- a/packages/forms/src/blueprint.ts
+++ b/packages/forms/src/blueprint.ts
@@ -11,6 +11,7 @@ import {
   type FieldsetPattern,
   type PagePattern,
   type PageSetPattern,
+  type RepeaterPattern,
   type SequencePattern,
 } from './patterns';
 import { type Blueprint, type FormOutput, type FormSummary } from './types';
@@ -396,45 +397,75 @@ export const copyPattern = (
   return { bp: updatedBp, pattern: newPattern };
 };
 
-export const addPatternToFieldset = (
+export const addPatternToCompoundField = (
   bp: Blueprint,
-  fieldsetPatternId: PatternId,
+  patternId: PatternId,
   pattern: Pattern,
+  type: 'fieldset' | 'repeater',
   index?: number
 ): Blueprint => {
-  const fieldsetPattern = bp.patterns[fieldsetPatternId] as FieldsetPattern;
-  if (fieldsetPattern.type !== 'fieldset') {
-    throw new Error('Pattern is not a page.');
+  const targetPattern = bp.patterns[patternId] as
+    | FieldsetPattern
+    | RepeaterPattern;
+  if (targetPattern.type !== type) {
+    throw new Error(`Pattern is not a ${type}.`);
   }
 
-  let updatedPagePattern: PatternId[];
-
-  if (index !== undefined) {
-    updatedPagePattern = [
-      ...fieldsetPattern.data.patterns.slice(0, index + 1),
-      pattern.id,
-      ...fieldsetPattern.data.patterns.slice(index + 1),
-    ];
-  } else {
-    updatedPagePattern = [...fieldsetPattern.data.patterns, pattern.id];
-  }
+  const updatedPatterns =
+    index !== undefined
+      ? [
+          ...targetPattern.data.patterns.slice(0, index + 1),
+          pattern.id,
+          ...targetPattern.data.patterns.slice(index + 1),
+        ]
+      : [...targetPattern.data.patterns, pattern.id];
 
   return {
     ...bp,
     patterns: {
       ...bp.patterns,
-      [fieldsetPattern.id]: {
-        ...fieldsetPattern,
+      [targetPattern.id]: {
+        ...targetPattern,
         data: {
-          ...fieldsetPattern.data,
-          patterns: updatedPagePattern,
+          ...targetPattern.data,
+          patterns: updatedPatterns,
         },
-      } satisfies FieldsetPattern,
+      } satisfies FieldsetPattern | RepeaterPattern,
       [pattern.id]: pattern,
     },
   };
 };
 
+export const addPatternToFieldset = (
+  bp: Blueprint,
+  fieldsetPatternId: PatternId,
+  pattern: Pattern,
+  index?: number
+): Blueprint => {
+  return addPatternToCompoundField(
+    bp,
+    fieldsetPatternId,
+    pattern,
+    'fieldset',
+    index
+  );
+};
+
+export const addPatternToRepeater = (
+  bp: Blueprint,
+  repeaterPatternId: PatternId,
+  pattern: Pattern,
+  index?: number
+): Blueprint => {
+  return addPatternToCompoundField(
+    bp,
+    repeaterPatternId,
+    pattern,
+    'repeater',
+    index
+  );
+};
+
 export const addPageToPageSet = (
   bp: Blueprint,
   pattern: Pattern
diff --git a/packages/forms/src/builder/index.ts b/packages/forms/src/builder/index.ts
index 74323ccb..f31057f1 100644
--- a/packages/forms/src/builder/index.ts
+++ b/packages/forms/src/builder/index.ts
@@ -3,6 +3,7 @@ import {
   addPageToPageSet,
   addPatternToFieldset,
   addPatternToPage,
+  addPatternToRepeater,
   copyPattern,
   createOnePageBlueprint,
   movePatternBetweenPages,
@@ -24,6 +25,7 @@ import { type FieldsetPattern } from '../patterns/fieldset/config.js';
 import { type PageSetPattern } from '../patterns/page-set/config.js';
 import type { Blueprint, FormSummary } from '../types.js';
 import type { ParsedPdf } from '../documents/pdf/parsing-api.js';
+import { type RepeaterPattern } from '../patterns/repeater/index.js';
 
 export class BlueprintBuilder {
   bp: Blueprint;
@@ -112,6 +114,11 @@ export class BlueprintBuilder {
     return results.pattern;
   }
 
+  getPatternTypeById(patternId: PatternId) {
+    const root = this.form.patterns[patternId];
+    return root.type;
+  }
+
   addPatternToFieldset(patternType: string, fieldsetPatternId: PatternId) {
     const pattern = createDefaultPattern(this.config, patternType);
     const root = this.form.patterns[fieldsetPatternId] as FieldsetPattern;
@@ -122,6 +129,16 @@ export class BlueprintBuilder {
     return pattern;
   }
 
+  addPatternToRepeater(patternType: string, patternId: PatternId) {
+    const pattern = createDefaultPattern(this.config, patternType);
+    const root = this.form.patterns[patternId] as RepeaterPattern;
+    if (root.type !== 'repeater') {
+      throw new Error('expected pattern to be a repeater');
+    }
+    this.bp = addPatternToRepeater(this.form, patternId, pattern);
+    return pattern;
+  }
+
   removePattern(id: PatternId) {
     this.bp = removePatternFromBlueprint(this.config, this.bp, id);
   }
diff --git a/packages/forms/src/components.ts b/packages/forms/src/components.ts
index c5364c04..5e4e192f 100644
--- a/packages/forms/src/components.ts
+++ b/packages/forms/src/components.ts
@@ -18,6 +18,7 @@ export type PackageDownloadProps = PatternProps<{
 export type TextInputProps = PatternProps<{
   type: 'input';
   inputId: string;
+  idSuffix?: string;
   value: string;
   label: string;
   required: boolean;
@@ -74,6 +75,7 @@ export type ZipcodeProps = PatternProps<{
 export type CheckboxProps = PatternProps<{
   type: 'checkbox';
   id: string;
+  idSuffix?: string;
   label: string;
   defaultChecked: boolean;
 }>;
@@ -93,6 +95,7 @@ export type RadioGroupProps = PatternProps<{
   type: 'radio-group';
   groupId: string;
   legend: string;
+  idSuffix?: string;
   options: {
     id: string;
     name: string;
@@ -152,6 +155,14 @@ export type SocialSecurityNumberProps = PatternProps<{
   value: string;
 }>;
 
+export type RepeaterProps = PatternProps<{
+  type: 'repeater';
+  legend?: string;
+  showControls?: boolean;
+  subHeading?: string;
+  error?: FormError;
+}>;
+
 export type SequenceProps = PatternProps<{
   type: 'sequence';
 }>;
diff --git a/packages/forms/src/documents/document.ts b/packages/forms/src/documents/document.ts
index 2338834b..d1fd1abe 100644
--- a/packages/forms/src/documents/document.ts
+++ b/packages/forms/src/documents/document.ts
@@ -167,7 +167,11 @@ export const addDocumentFieldsToForm = (
           maxLength: 128,
         },
       } satisfies InputPattern);
-    } else if (field.type === 'Paragraph' || field.type === 'RichText') {
+    } else if (
+      field.type === 'Paragraph' ||
+      field.type === 'RichText' ||
+      field.type === 'Repeater'
+    ) {
       // skip purely presentational fields
     } else if (field.type === 'not-supported') {
       console.error(`Skipping field: ${field.error}`);
diff --git a/packages/forms/src/documents/pdf/generate.ts b/packages/forms/src/documents/pdf/generate.ts
index 63aade0e..73c04868 100644
--- a/packages/forms/src/documents/pdf/generate.ts
+++ b/packages/forms/src/documents/pdf/generate.ts
@@ -132,7 +132,11 @@ const setFormFieldData = (
         field.uncheck();
       }
     }
-  } else if (fieldType === 'Paragraph' || fieldType === 'RichText') {
+  } else if (
+    fieldType === 'Paragraph' ||
+    fieldType === 'RichText' ||
+    fieldType === 'Repeater'
+  ) {
     // do nothing
   } else {
     const exhaustiveCheck: never = fieldType;
diff --git a/packages/forms/src/documents/pdf/index.ts b/packages/forms/src/documents/pdf/index.ts
index edafb097..60b3e06f 100644
--- a/packages/forms/src/documents/pdf/index.ts
+++ b/packages/forms/src/documents/pdf/index.ts
@@ -27,6 +27,7 @@ export type PDFFieldType =
   | 'OptionList'
   | 'RadioGroup'
   | 'Paragraph'
+  | 'Repeater'
   | 'RichText';
 
 export type ParsePdf = (
diff --git a/packages/forms/src/documents/pdf/parsing-api.ts b/packages/forms/src/documents/pdf/parsing-api.ts
index d24b9a86..750a3e09 100644
--- a/packages/forms/src/documents/pdf/parsing-api.ts
+++ b/packages/forms/src/documents/pdf/parsing-api.ts
@@ -8,6 +8,7 @@ import { type ParagraphPattern } from '../../patterns/paragraph.js';
 import { type CheckboxPattern } from '../../patterns/checkbox.js';
 import { type RadioGroupPattern } from '../../patterns/radio-group.js';
 import { RichTextPattern } from '../../patterns/rich-text.js';
+import { type RepeaterPattern } from '../../patterns/repeater/index.js';
 
 import { uint8ArrayToBase64 } from '../../util/base64.js';
 import { type DocumentFieldMap } from '../types.js';
@@ -79,11 +80,26 @@ const Fieldset = z.object({
   page: z.union([z.number(), z.string()]),
 });
 
+const Repeater = z.object({
+  component_type: z.literal('repeater'),
+  legend: z.string(),
+  fields: z.union([TxInput, Checkbox]).array(),
+  page: z.union([z.number(), z.string()]),
+});
+
 const ExtractedObject = z.object({
   raw_text: z.string(),
   form_summary: FormSummary,
   elements: z
-    .union([TxInput, Checkbox, RadioGroup, Paragraph, Fieldset, RichText])
+    .union([
+      TxInput,
+      Checkbox,
+      RadioGroup,
+      Paragraph,
+      Fieldset,
+      RichText,
+      Repeater,
+    ])
     .array(),
 });
 
@@ -157,6 +173,7 @@ export const processApiResponse = async (json: any): Promise<ParsedPdf> => {
 
   for (const element of extracted.elements) {
     const fieldsetPatterns: PatternId[] = [];
+
     // Add paragraph elements
     if (element.component_type === 'paragraph') {
       const paragraph = processPatternData<ParagraphPattern>(
diff --git a/packages/forms/src/documents/types.ts b/packages/forms/src/documents/types.ts
index a94d4d2a..329f7f72 100644
--- a/packages/forms/src/documents/types.ts
+++ b/packages/forms/src/documents/types.ts
@@ -44,6 +44,14 @@ export type DocumentFieldValue =
       value: string;
       required: boolean;
     }
+  | {
+      type: 'Repeater';
+      name: string;
+      options: string[];
+      label: string;
+      value: string;
+      required: boolean;
+    }
   | {
       type: 'RichText';
       name: string;
diff --git a/packages/forms/src/index.ts b/packages/forms/src/index.ts
index 11200c7c..9adfe2cd 100644
--- a/packages/forms/src/index.ts
+++ b/packages/forms/src/index.ts
@@ -20,6 +20,7 @@ import { type PageSetPattern } from './patterns/page-set/config.js';
 export { type RichTextPattern } from './patterns/rich-text.js';
 import { type SequencePattern } from './patterns/sequence.js';
 import { FieldsetPattern } from './patterns/index.js';
+import { RepeaterPattern } from './patterns/index.js';
 export {
   type FormRepository,
   createFormsRepository,
diff --git a/packages/forms/src/pattern.ts b/packages/forms/src/pattern.ts
index 36c337ca..117085bb 100644
--- a/packages/forms/src/pattern.ts
+++ b/packages/forms/src/pattern.ts
@@ -121,6 +121,10 @@ export const validatePattern = (
   pattern: Pattern,
   value: any
 ): r.Result<Pattern['data'], FormError> => {
+  /**
+   * TODO: maybe touch this file to see if there are fields that are part of the repeater
+   * that are being treated and a standalone thing. uuid.index.uuid -> ownedByRepeater
+   */
   if (!patternConfig.parseUserInput) {
     return {
       success: true,
diff --git a/packages/forms/src/patterns/index.ts b/packages/forms/src/patterns/index.ts
index bb58d988..a29040dd 100644
--- a/packages/forms/src/patterns/index.ts
+++ b/packages/forms/src/patterns/index.ts
@@ -6,6 +6,7 @@ import { checkboxConfig } from './checkbox.js';
 import { dateOfBirthConfig } from './date-of-birth/date-of-birth.js';
 import { emailInputConfig } from './email-input/email-input.js';
 import { fieldsetConfig } from './fieldset/index.js';
+import { repeaterConfig } from './repeater/index.js';
 import { formSummaryConfig } from './form-summary.js';
 import { inputConfig } from './input/index.js';
 import { packageDownloadConfig } from './package-download/index.js';
@@ -36,6 +37,7 @@ export const defaultFormConfig: FormConfig = {
     page: pageConfig,
     'page-set': pageSetConfig,
     paragraph: paragraphConfig,
+    repeater: repeaterConfig,
     'phone-number': phoneNumberConfig,
     'radio-group': radioGroupConfig,
     'rich-text': richTextConfig,
@@ -65,6 +67,7 @@ export { type PageSetPattern } from './page-set/config.js';
 export * from './paragraph.js';
 export * from './phone-number/phone-number.js';
 export * from './radio-group.js';
+export * from './repeater/index.js';
 export * from './select-dropdown/select-dropdown.js';
 export * from './social-security-number/social-security-number.js';
 export * from './sequence.js';
diff --git a/packages/forms/src/patterns/input/prompt.ts b/packages/forms/src/patterns/input/prompt.ts
index a7357dab..e9dd710d 100644
--- a/packages/forms/src/patterns/input/prompt.ts
+++ b/packages/forms/src/patterns/input/prompt.ts
@@ -19,6 +19,13 @@ export const createPrompt: CreatePrompt<InputPattern> = (
       extraAttributes['error'] = isValidResult.error;
     }
   }
+
+  console.group('input/createprompt');
+  console.log(session);
+  console.log(options);
+  console.log(pattern);
+  console.groupEnd();
+
   return {
     props: {
       _patternId: pattern.id,
diff --git a/packages/forms/src/patterns/input/response.ts b/packages/forms/src/patterns/input/response.ts
index 0866f948..068bedce 100644
--- a/packages/forms/src/patterns/input/response.ts
+++ b/packages/forms/src/patterns/input/response.ts
@@ -6,11 +6,19 @@ import { safeZodParseToFormError } from '../../util/zod.js';
 import { type InputPattern } from './config.js';
 
 const createSchema = (data: InputPattern['data']) => {
-  const schema = z.string().max(data.maxLength);
-  if (!data.required) {
-    return schema;
-  }
-  return schema.min(1, { message: 'This field is required' });
+  const stringSchema = z.string().max(data.maxLength);
+
+  const baseSchema = data.required
+    ? stringSchema.min(1, { message: 'This field is required' })
+    : stringSchema;
+
+  // Using z.union to handle both single string and object with `repeater` array of strings
+  return z.union([
+    baseSchema,
+    z.object({
+      repeater: z.array(baseSchema),
+    }),
+  ]);
 };
 
 export type InputPatternOutput = z.infer<ReturnType<typeof createSchema>>;
@@ -19,5 +27,9 @@ export const parseUserInput: ParseUserInput<
   InputPattern,
   InputPatternOutput
 > = (pattern, obj) => {
+  console.group('parseUserInput');
+  console.log(pattern);
+  console.log(obj);
+  console.groupEnd();
   return safeZodParseToFormError(createSchema(pattern['data']), obj);
 };
diff --git a/packages/forms/src/patterns/radio-group.ts b/packages/forms/src/patterns/radio-group.ts
index e66af39f..b47868b1 100644
--- a/packages/forms/src/patterns/radio-group.ts
+++ b/packages/forms/src/patterns/radio-group.ts
@@ -87,6 +87,10 @@ export const radioGroupConfig: PatternConfig<RadioGroupPattern, PatternOutput> =
           extraAttributes['error'] = isValidResult.error;
         }
       }
+      console.group('radio/createPrompt');
+      console.log(pattern);
+      console.groupEnd();
+
       return {
         props: {
           _patternId: pattern.id,
diff --git a/packages/forms/src/patterns/repeater/config.ts b/packages/forms/src/patterns/repeater/config.ts
new file mode 100644
index 00000000..09633317
--- /dev/null
+++ b/packages/forms/src/patterns/repeater/config.ts
@@ -0,0 +1,31 @@
+import { z } from 'zod';
+
+import { safeZodParseFormErrors } from '../../util/zod.js';
+import { ParsePatternConfigData } from '../../pattern.js';
+
+const configSchema = z.object({
+  legend: z.string().min(1),
+  patterns: z.union([
+    // Support either an array of strings...
+    z.array(z.string()),
+    // ...or a comma-separated string.
+    // REVISIT: This is messy, and exists only so we can store the data easily
+    // as a hidden input in the form. We should probably just store it as JSON.
+    z
+      .string()
+      .transform(value =>
+        value
+          .split(',')
+          .map(String)
+          .filter(value => value)
+      )
+      .pipe(z.string().array()),
+  ]),
+});
+export type RepeaterConfigSchema = z.infer<typeof configSchema>;
+
+export const parseConfigData: ParsePatternConfigData<
+  RepeaterConfigSchema
+> = obj => {
+  return safeZodParseFormErrors(configSchema, obj);
+};
diff --git a/packages/forms/src/patterns/repeater/index.ts b/packages/forms/src/patterns/repeater/index.ts
new file mode 100644
index 00000000..4e6e0b5a
--- /dev/null
+++ b/packages/forms/src/patterns/repeater/index.ts
@@ -0,0 +1,50 @@
+import {
+  type Pattern,
+  type PatternConfig,
+  type PatternId,
+} from '../../pattern.js';
+import { parseConfigData } from './config.js';
+import { createPrompt } from './prompt.js';
+
+export type RepeaterPattern = Pattern<{
+  legend?: string;
+  showControls?: boolean;
+  patterns: PatternId[];
+}>;
+
+export const repeaterConfig: PatternConfig<RepeaterPattern> = {
+  displayName: 'Repeater',
+  iconPath: 'block-icon.svg',
+  initial: {
+    legend: 'Default Heading',
+    patterns: [],
+  },
+  parseConfigData,
+  getChildren(pattern, patterns) {
+    return pattern.data.patterns.map(
+      (patternId: string) => patterns[patternId]
+    );
+  },
+  /*
+   * TODO: this probably needs a parseUserInput method that maps over the repeater pattern and then
+   *  gets all its child components in a new function. Dan suggested that this is a way to get the dynamic
+   * indexes working.
+   *
+   */
+  removeChildPattern(pattern, patternId) {
+    const newPatterns = pattern.data.patterns.filter(
+      (id: string) => patternId !== id
+    );
+    if (newPatterns.length === pattern.data.patterns.length) {
+      return pattern;
+    }
+    return {
+      ...pattern,
+      data: {
+        ...pattern.data,
+        patterns: newPatterns,
+      },
+    };
+  },
+  createPrompt,
+};
diff --git a/packages/forms/src/patterns/repeater/prompt.ts b/packages/forms/src/patterns/repeater/prompt.ts
new file mode 100644
index 00000000..8784a86d
--- /dev/null
+++ b/packages/forms/src/patterns/repeater/prompt.ts
@@ -0,0 +1,57 @@
+import { type RepeaterPattern } from './index.js';
+import {
+  type CreatePrompt,
+  type RepeaterProps,
+  createPromptForPattern,
+  getPattern,
+} from '../../index.js';
+
+export const createPrompt: CreatePrompt<RepeaterPattern> = (
+  config,
+  session,
+  pattern,
+  options
+) => {
+  console.group('repeater/createPrompt');
+  console.log(session);
+  console.log(pattern);
+  console.groupEnd();
+
+  const children = pattern.data.patterns.map((patternId: string) => {
+    let childPattern = getPattern(session.form, patternId);
+    childPattern = {
+      ...childPattern,
+      /**
+       * TODO: Dynamically generate the index here. %%INDEX%% is a placeholder
+       */
+      id: `${pattern.id}.%%INDEX%%.${childPattern.id}`
+    }
+
+    // {
+    //   "id": "8c8a358d-e977-4d9b-9671-43bf6e847f5d",
+    //   "type": "input",
+    //   "data": {
+    //   "label": "Field label",
+    //     "initial": "",
+    //     "required": true,
+    //     "maxLength": 128
+    // }
+    // }
+    console.group('repeater/createPrompt/children');
+    console.log(childPattern);
+    console.log(options);
+    console.groupEnd();
+    return createPromptForPattern(config, session, childPattern, options);
+  });
+
+
+  return {
+    props: {
+      _patternId: pattern.id,
+      type: 'repeater',
+      legend: pattern.data.legend,
+      showControls: true,
+    } satisfies RepeaterProps,
+    children,
+  };
+};
diff --git a/packages/forms/src/services/submit-form.test.ts b/packages/forms/src/services/submit-form.test.ts
index 5dba1149..6e6726d3 100644
--- a/packages/forms/src/services/submit-form.test.ts
+++ b/packages/forms/src/services/submit-form.test.ts
@@ -97,11 +97,11 @@ describe('submitForm', () => {
           data: {
             errors: {
               'element-1': {
-                message: 'Required',
+                message: 'Invalid input',
                 type: 'custom',
               },
               'element-2': {
-                message: 'Required',
+                message: 'Invalid input',
                 type: 'custom',
               },
             },
@@ -297,7 +297,7 @@ describe('multi-page form', () => {
           data: {
             errors: {
               'element-1': {
-                message: 'Required',
+                message: 'Invalid input',
                 type: 'custom',
               },
             },
diff --git a/packages/forms/src/session.ts b/packages/forms/src/session.ts
index 9823e034..3738c78f 100644
--- a/packages/forms/src/session.ts
+++ b/packages/forms/src/session.ts
@@ -140,6 +140,12 @@ export const updateSession = (
 };
 
 export const sessionIsComplete = (config: FormConfig, session: FormSession) => {
+  /*
+   * TODO: check to see if the pattern is owned by a repeater field. If so, validate
+   *  each field of the repeater based on the validation rules for the individual field type.
+   */
+
+
   return Object.values(session.form.patterns).every(pattern => {
     const patternConfig = getPatternConfig(config, pattern.type);
     const value = getFormSessionValue(session, pattern.id);
diff --git a/packages/server/src/main.db b/packages/server/src/main.db
new file mode 100644
index 00000000..91521999
Binary files /dev/null and b/packages/server/src/main.db differ