diff --git a/apps/api/src/features/routines/routine.routes.test.ts b/apps/api/src/features/routines/routine.routes.test.ts
index 68c2d7f..a3ad7ec 100644
--- a/apps/api/src/features/routines/routine.routes.test.ts
+++ b/apps/api/src/features/routines/routine.routes.test.ts
@@ -86,8 +86,9 @@ describe('POST /routines', () => {
       exercises: [
         {
           ...createRoutineInput.exercises[0],
-          restBetweenSetsSeconds: 0,
+          restBetweenSetsSeconds: 60,
           restAfterExerciseSeconds: 0,
+          notes: null,
         },
       ],
       schedules: [],
diff --git a/apps/api/src/features/routines/routine.service.test.ts b/apps/api/src/features/routines/routine.service.test.ts
index a6c5e66..09de793 100644
--- a/apps/api/src/features/routines/routine.service.test.ts
+++ b/apps/api/src/features/routines/routine.service.test.ts
@@ -64,6 +64,7 @@ describe('createRoutineForUser', () => {
           weightUnit: 'lb',
           restBetweenSetsSeconds: 60,
           restAfterExerciseSeconds: 90,
+          notes: null,
         },
       ],
       schedules: [{ dayOfWeek: 3, localTime: '18:30:00' }],
@@ -128,6 +129,7 @@ describe('createRoutineForUser', () => {
             weightUnit: 'lb',
             restBetweenSetsSeconds: 0,
             restAfterExerciseSeconds: 0,
+            notes: null,
           },
         ],
         schedules: [],
diff --git a/apps/web/src/components/ui/number-stepper.tsx b/apps/web/src/components/ui/number-stepper.tsx
index 759b76a..b3a1484 100644
--- a/apps/web/src/components/ui/number-stepper.tsx
+++ b/apps/web/src/components/ui/number-stepper.tsx
@@ -8,6 +8,7 @@ import { Button } from './button';
 type NumberStepperProps = {
   defaultValue: number;
   id: string;
+  onValueChange: (value: number) => void;
   min?: number;
 };
 
@@ -15,20 +16,26 @@ export function NumberStepper({
   defaultValue,
   id,
   min = 1,
+  onValueChange,
 }: NumberStepperProps) {
   const [value, setValue] = useState<number | string>(defaultValue);
 
   const decreaseValue = () => {
-    setValue((currentValue) => Math.max(min, Number(currentValue || min) - 1));
+    const nextValue = Math.max(min, Number(value || min) - 1);
+    setValue(nextValue);
+    onValueChange(nextValue);
   };
 
   const increaseValue = () => {
-    setValue((currentValue) => Number(currentValue || min) + 1);
+    const nextValue = Number(value || min) + 1;
+    setValue(nextValue);
+    onValueChange(nextValue);
   };
 
   const finishEditing = () => {
     if (value === '' || Number(value) < min) {
       setValue(min);
+      onValueChange(min);
     }
   };
 
@@ -62,6 +69,10 @@ export function NumberStepper({
 
           if (nextValue === '' || /^\d+$/.test(nextValue)) {
             setValue(nextValue);
+
+            if (nextValue !== '') {
+              onValueChange(Number(nextValue));
+            }
           }
         }}
         type="number"
diff --git a/apps/web/src/components/ui/positive-integer-input.tsx b/apps/web/src/components/ui/positive-integer-input.tsx
index fab8697..26d855d 100644
--- a/apps/web/src/components/ui/positive-integer-input.tsx
+++ b/apps/web/src/components/ui/positive-integer-input.tsx
@@ -3,21 +3,24 @@ import { useState } from 'react';
 import { Input } from './input';
 
 type PositiveIntegerInputProps = {
-  className?: string;
   defaultValue: number;
   id: string;
+  onValueChange: (value: number) => void;
+  className?: string;
 };
 
 export function PositiveIntegerInput({
   defaultValue,
   id,
   className,
+  onValueChange,
 }: PositiveIntegerInputProps) {
   const [value, setValue] = useState<number | string>(defaultValue);
 
   const finishEditing = () => {
     if (value === '' || Number(value) < 1) {
       setValue(1);
+      onValueChange(1);
     }
   };
 
@@ -33,6 +36,10 @@ export function PositiveIntegerInput({
 
         if (nextValue === '' || /^\d+$/.test(nextValue)) {
           setValue(nextValue);
+
+          if (nextValue !== '') {
+            onValueChange(Number(nextValue));
+          }
         }
       }}
       type="number"
diff --git a/apps/web/src/features/routines/exercise-configuration.test.tsx b/apps/web/src/features/routines/exercise-configuration.test.tsx
index 56e4ae6..50ad605 100644
--- a/apps/web/src/features/routines/exercise-configuration.test.tsx
+++ b/apps/web/src/features/routines/exercise-configuration.test.tsx
@@ -3,13 +3,20 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import {
   createMemoryHistory,
   createRootRoute,
+  createRoute,
   createRouter,
+  Outlet,
   RouterProvider,
 } from '@tanstack/react-router';
 import { cleanup, render, screen } from '@testing-library/react';
-import type { PropsWithChildren } from 'react';
+import userEvent from '@testing-library/user-event';
+import { useFormContext, useWatch } from 'react-hook-form';
 import { afterEach, expect, it, vi } from 'vitest';
 
+import {
+  RoutineDraftFormProvider,
+  type RoutineDraftFormValues,
+} from './routine-draft-form';
 import { ExerciseConfiguration } from './exercise-configuration';
 
 afterEach(() => {
@@ -17,24 +24,50 @@ afterEach(() => {
   vi.unstubAllGlobals();
 });
 
-function Wrapper({ children }: PropsWithChildren) {
+function renderConfiguration(exerciseId: string) {
   const queryClient = new QueryClient({
     defaultOptions: { queries: { retry: false } },
   });
-  const rootRoute = createRootRoute({ component: () => children });
+  const rootRoute = createRootRoute({ component: TestLayout });
+  const configurationRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: '/configure',
+    component: () => <ExerciseConfiguration exerciseId={exerciseId} />,
+  });
+  const editorRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: '/routines/new',
+    component: DraftExerciseCount,
+  });
   const router = createRouter({
-    history: createMemoryHistory({ initialEntries: ['/'] }),
-    routeTree: rootRoute,
+    history: createMemoryHistory({ initialEntries: ['/configure'] }),
+    routeTree: rootRoute.addChildren([configurationRoute, editorRoute]),
   });
 
-  return (
+  render(
     <QueryClientProvider client={queryClient}>
       <RouterProvider router={router} />
-    </QueryClientProvider>
+    </QueryClientProvider>,
+  );
+}
+
+function TestLayout() {
+  return (
+    <RoutineDraftFormProvider>
+      <Outlet />
+    </RoutineDraftFormProvider>
   );
 }
 
+function DraftExerciseCount() {
+  const { control } = useFormContext<RoutineDraftFormValues>();
+  const exercises = useWatch({ control, name: 'exercises' });
+
+  return <p>Saved exercises: {exercises.length}</p>;
+}
+
 it('shows the selected exercise and initial configuration fields', async () => {
+  const user = userEvent.setup();
   const exerciseId = '26d34dc0-8e4c-4bd0-9e3b-7b839b44e486';
   vi.stubGlobal(
     'fetch',
@@ -52,12 +85,14 @@ it('shows the selected exercise and initial configuration fields', async () => {
     ),
   );
 
-  render(<ExerciseConfiguration exerciseId={exerciseId} />, {
-    wrapper: Wrapper,
-  });
+  renderConfiguration(exerciseId);
 
   expect(await screen.findByText('Bicep Curl')).toBeVisible();
   expect(screen.getByLabelText('Sets')).toHaveValue(3);
   expect(screen.getByLabelText('Reps')).toHaveValue(8);
-  expect(screen.getByRole('button', { name: 'Done' })).toBeDisabled();
+  expect(screen.getByRole('button', { name: 'Done' })).toBeEnabled();
+
+  await user.click(screen.getByRole('button', { name: 'Done' }));
+
+  expect(await screen.findByText('Saved exercises: 1')).toBeVisible();
 });
diff --git a/apps/web/src/features/routines/exercise-configuration.tsx b/apps/web/src/features/routines/exercise-configuration.tsx
index 783825e..9be171f 100644
--- a/apps/web/src/features/routines/exercise-configuration.tsx
+++ b/apps/web/src/features/routines/exercise-configuration.tsx
@@ -1,17 +1,34 @@
 /** Presents the configuration shell for an exercise selected for a routine. */
-import type { ExerciseSummary } from '@goforlift/contracts';
-import { Link } from '@tanstack/react-router';
+import { zodResolver } from '@hookform/resolvers/zod';
+import {
+  createRoutineExerciseInputSchema,
+  type ExerciseSummary,
+} from '@goforlift/contracts';
+import { Link, useNavigate } from '@tanstack/react-router';
 import { Dumbbell, X } from 'lucide-react';
+import {
+  type UseFormRegister,
+  type UseFormSetValue,
+  useForm,
+  useFormContext,
+} from 'react-hook-form';
 
 import { cn } from '@/lib/utils';
 
-import { Button } from '../../components/ui/button';
-import { Label } from '../../components/ui/label';
-import { LoadingState } from '../../components/ui/loading-state';
-import { NumberStepper } from '../../components/ui/number-stepper';
-import { PageTitle } from '../../components/ui/page-title';
-import { PositiveIntegerInput } from '../../components/ui/positive-integer-input';
-import { useExercises } from '../exercises/exercises.query';
+import { Button } from '@/components/ui/button';
+import { Label } from '@/components/ui/label';
+import { LoadingState } from '@/components/ui/loading-state';
+import { NumberStepper } from '@/components/ui/number-stepper';
+import { PageTitle } from '@/components/ui/page-title';
+import { PositiveIntegerInput } from '@/components/ui/positive-integer-input';
+import { useExercises } from '@/features/exercises/exercises.query';
+import type { RoutineDraftFormValues } from './routine-draft-form';
+import { z } from 'zod';
+
+type RoutineExerciseFormValues = z.input<
+  typeof createRoutineExerciseInputSchema
+>;
+type RoutineExerciseInput = z.output<typeof createRoutineExerciseInputSchema>;
 
 type ExerciseConfigurationProps = {
   exerciseId: string;
@@ -71,14 +88,46 @@ function ExerciseConfigurationForm({
 }: {
   exercise: ExerciseSummary;
 }) {
+  const navigate = useNavigate();
+  const { getValues, setValue: setDraftValue } =
+    useFormContext<RoutineDraftFormValues>();
+  const defaultValues = createRoutineExerciseInputSchema.parse({
+    exerciseId: exercise.id,
+    position: getValues('exercises').length,
+  });
+  const {
+    handleSubmit,
+    register,
+    setValue: setConfigurationValue,
+  } = useForm<RoutineExerciseFormValues, unknown, RoutineExerciseInput>({
+    defaultValues,
+    mode: 'onChange',
+    resolver: zodResolver(createRoutineExerciseInputSchema),
+  });
+
+  async function saveExercise(input: RoutineExerciseInput) {
+    setDraftValue('exercises', [...getValues('exercises'), input], {
+      shouldDirty: true,
+      shouldValidate: true,
+    });
+    await navigate({ to: '/routines/new' });
+  }
+
   return (
-    <div className="lg:grid lg:grid-cols-[1fr_3fr] lg:divide-x lg:divide-border/40">
+    <form
+      className="lg:grid lg:grid-cols-[1fr_3fr] lg:divide-x lg:divide-border/40"
+      onSubmit={(event) => void handleSubmit(saveExercise)(event)}
+    >
       <ExerciseIdentity exercise={exercise} />
 
       <div className="mt-7 lg:mt-0 lg:pl-8">
-        <ExerciseFields />
+        <ExerciseFields
+          defaultValues={defaultValues}
+          register={register}
+          setValue={setConfigurationValue}
+        />
       </div>
-    </div>
+    </form>
   );
 }
 
@@ -110,12 +159,32 @@ function ExerciseIdentity({ exercise }: { exercise: ExerciseSummary }) {
   );
 }
 
-function ExerciseFields() {
+function ExerciseFields({
+  defaultValues,
+  register,
+  setValue,
+}: {
+  defaultValues: RoutineExerciseInput;
+  register: UseFormRegister<RoutineExerciseFormValues>;
+  setValue: UseFormSetValue<RoutineExerciseFormValues>;
+}) {
   return (
     <div>
       <div className="space-y-5">
-        <NumberField defaultValue={3} id="exercise-sets" label="Sets" />
-        <NumberField defaultValue={8} id="exercise-reps" label="Reps" />
+        <NumberField
+          defaultValue={defaultValues.sets}
+          field="sets"
+          id="exercise-sets"
+          label="Sets"
+          setValue={setValue}
+        />
+        <NumberField
+          defaultValue={defaultValues.targetReps}
+          field="targetReps"
+          id="exercise-reps"
+          label="Reps"
+          setValue={setValue}
+        />
 
         <div className="flex items-center justify-between gap-6">
           <Label htmlFor="exercise-weight">Weight</Label>
@@ -127,13 +196,17 @@ function ExerciseFields() {
           >
             <PositiveIntegerInput
               className="h-full min-w-0 rounded-none border-0 bg-transparent shadow-none"
-              defaultValue={10}
+              defaultValue={defaultValues.weight}
               id="exercise-weight"
+              onValueChange={(value) =>
+                setValue('weight', value, { shouldValidate: true })
+              }
             />
             <select
               aria-label="Weight unit"
               className="h-full border-0 border-l border-input bg-surface-elevated px-3 text-sm outline-none"
-              defaultValue="lb"
+              defaultValue={defaultValues.weightUnit}
+              {...register('weightUnit')}
             >
               <option value="lb">lb</option>
               <option value="kg">kg</option>
@@ -142,9 +215,11 @@ function ExerciseFields() {
         </div>
 
         <NumberField
-          defaultValue={60}
+          defaultValue={defaultValues.restBetweenSetsSeconds}
+          field="restBetweenSetsSeconds"
           id="exercise-rest"
           label="Rest Between Sets"
+          setValue={setValue}
           suffix="seconds"
         />
 
@@ -160,6 +235,7 @@ function ExerciseFields() {
             )}
             id="exercise-notes"
             placeholder="E.g., keep elbows tucked in."
+            {...register('notes')}
           />
         </div>
       </div>
@@ -168,7 +244,7 @@ function ExerciseFields() {
         <Button asChild variant="outline">
           <Link to="/routines/new/exercises">Cancel</Link>
         </Button>
-        <Button disabled>Done</Button>
+        <Button type="submit">Done</Button>
       </div>
     </div>
   );
@@ -176,12 +252,21 @@ function ExerciseFields() {
 
 type NumberFieldProps = {
   defaultValue: number;
+  field: 'sets' | 'targetReps' | 'restBetweenSetsSeconds';
   id: string;
   label: string;
+  setValue: UseFormSetValue<RoutineExerciseFormValues>;
   suffix?: string;
 };
 
-function NumberField({ defaultValue, id, label, suffix }: NumberFieldProps) {
+function NumberField({
+  defaultValue,
+  field,
+  id,
+  label,
+  setValue,
+  suffix,
+}: NumberFieldProps) {
   return (
     <div className="flex items-center justify-between gap-6">
       <Label className="whitespace-nowrap" htmlFor={id}>
@@ -199,13 +284,22 @@ function NumberField({ defaultValue, id, label, suffix }: NumberFieldProps) {
             className="h-full rounded-none border-0 bg-transparent shadow-none"
             defaultValue={defaultValue}
             id={id}
+            onValueChange={(value) =>
+              setValue(field, value, { shouldValidate: true })
+            }
           />
           <span className="flex items-center border-l px-3 text-sm text-muted-foreground">
             {suffix}
           </span>
         </div>
       ) : (
-        <NumberStepper defaultValue={defaultValue} id={id} />
+        <NumberStepper
+          defaultValue={defaultValue}
+          id={id}
+          onValueChange={(value) =>
+            setValue(field, value, { shouldValidate: true })
+          }
+        />
       )}
     </div>
   );
diff --git a/apps/web/src/features/routines/routine-draft-form.tsx b/apps/web/src/features/routines/routine-draft-form.tsx
index 3caa108..37a2a74 100644
--- a/apps/web/src/features/routines/routine-draft-form.tsx
+++ b/apps/web/src/features/routines/routine-draft-form.tsx
@@ -1,23 +1,38 @@
 /** Provides one routine draft form across every route in the creation flow. */
 import { zodResolver } from '@hookform/resolvers/zod';
-import { routineNameSchema } from '@goforlift/contracts';
+import {
+  createRoutineExerciseInputSchema,
+  createRoutineScheduleInputSchema,
+  routineNameSchema,
+} from '@goforlift/contracts';
 import type { ReactNode } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { z } from 'zod';
 
 const routineDraftFormSchema = z.object({
   name: routineNameSchema,
+  exercises: z.array(createRoutineExerciseInputSchema),
+  schedules: z.array(createRoutineScheduleInputSchema),
 });
-
-export type RoutineDraftFormValues = z.infer<typeof routineDraftFormSchema>;
+// Exercise defaults live in the shared Zod contract so every consumer uses the
+// same values. Adding .default() lets those fields be omitted or undefined in
+// Zod's input, while Zod guarantees their values in its parsed output. RHF must
+// therefore use separate input and output types; z.infer describes only the
+// output and causes a resolver type mismatch when it is also used as the input.
+export type RoutineDraftFormValues = z.input<typeof routineDraftFormSchema>;
+type ParsedRoutineDraftFormValues = z.output<typeof routineDraftFormSchema>;
 
 export function RoutineDraftFormProvider({
   children,
 }: {
   children: ReactNode;
 }) {
-  const form = useForm<RoutineDraftFormValues>({
-    defaultValues: { name: '' },
+  const form = useForm<
+    RoutineDraftFormValues,
+    unknown,
+    ParsedRoutineDraftFormValues
+  >({
+    defaultValues: { exercises: [], name: '', schedules: [] },
     mode: 'onChange', // when to run validation.
     resolver: zodResolver(routineDraftFormSchema),
   });
diff --git a/apps/web/src/features/routines/routine-editor.tsx b/apps/web/src/features/routines/routine-editor.tsx
index 79fadeb..58238d3 100644
--- a/apps/web/src/features/routines/routine-editor.tsx
+++ b/apps/web/src/features/routines/routine-editor.tsx
@@ -1,7 +1,7 @@
 /** Presents the responsive visual shell for creating a registered-user routine. */
 import { Link, useNavigate } from '@tanstack/react-router';
 import { ArrowLeft, Plus } from 'lucide-react';
-import { useFormContext } from 'react-hook-form';
+import { useFormContext, useWatch } from 'react-hook-form';
 
 import { AddActionButton } from '../../components/ui/add-action-button';
 import { Button } from '../../components/ui/button';
@@ -92,10 +92,13 @@ function RoutineDetails() {
 }
 
 function ExerciseSection({ onAddExercise }: { onAddExercise: () => void }) {
+  const { control } = useFormContext<RoutineDraftFormValues>();
+  const exercises = useWatch({ control, name: 'exercises' });
+
   return (
     <div>
       <Label asChild>
-        <h2>Exercises (0)</h2>
+        <h2>Exercises ({exercises.length})</h2>
       </Label>
       <div className="mt-3">
         <AddActionButton onClick={onAddExercise} type="button">
diff --git a/packages/contracts/src/routines/routine.contract.test.ts b/packages/contracts/src/routines/routine.contract.test.ts
index 84f5ac1..9d68f8a 100644
--- a/packages/contracts/src/routines/routine.contract.test.ts
+++ b/packages/contracts/src/routines/routine.contract.test.ts
@@ -2,6 +2,7 @@
 import { describe, expect, it } from 'vitest';
 
 import {
+  createRoutineExerciseInputSchema,
   createRoutineInputSchema,
   ROUTINE_NAME_MAX_LENGTH,
   routineListResponseSchema,
@@ -43,7 +44,7 @@ describe('routineNameSchema', () => {
 });
 
 describe('createRoutineInputSchema', () => {
-  it('normalizes a valid routine and applies rest defaults', () => {
+  it('normalizes a valid routine and applies exercise defaults', () => {
     expect(createRoutineInputSchema.parse(validCreateRoutineInput)).toEqual({
       ...validCreateRoutineInput,
       name: 'Upper Body',
@@ -51,13 +52,33 @@ describe('createRoutineInputSchema', () => {
       exercises: [
         {
           ...validCreateRoutineInput.exercises[0],
-          restBetweenSetsSeconds: 0,
+          restBetweenSetsSeconds: 60,
           restAfterExerciseSeconds: 0,
+          notes: null,
         },
       ],
     });
   });
 
+  it('provides shared defaults for a newly selected exercise', () => {
+    const exercise = createRoutineExerciseInputSchema.parse({
+      exerciseId: '9f4b5a8e-2c3d-4f10-8a11-000000000001',
+      position: 0,
+    });
+
+    expect(exercise).toEqual({
+      exerciseId: '9f4b5a8e-2c3d-4f10-8a11-000000000001',
+      position: 0,
+      sets: 3,
+      targetReps: 8,
+      weight: 10,
+      weightUnit: 'lb',
+      restBetweenSetsSeconds: 60,
+      restAfterExerciseSeconds: 0,
+      notes: null,
+    });
+  });
+
   it('rejects invalid exercise configuration and schedules', () => {
     expect(() =>
       createRoutineInputSchema.parse({
diff --git a/packages/contracts/src/routines/routine.contract.ts b/packages/contracts/src/routines/routine.contract.ts
index 80dd669..06877da 100644
--- a/packages/contracts/src/routines/routine.contract.ts
+++ b/packages/contracts/src/routines/routine.contract.ts
@@ -16,13 +16,13 @@ export const createRoutineExerciseInputSchema = z
   .object({
     exerciseId: z.uuid(),
     position: z.number().int().nonnegative(),
-    sets: z.number().int().positive(),
-    targetReps: z.number().int().positive(),
-    weight: z.number().nonnegative(),
-    weightUnit: z.enum(['lb', 'kg']),
-    restBetweenSetsSeconds: z.number().int().nonnegative().default(0),
+    sets: z.number().int().positive().default(3),
+    targetReps: z.number().int().positive().default(8),
+    weight: z.number().nonnegative().default(10),
+    weightUnit: z.enum(['lb', 'kg']).default('lb'),
+    restBetweenSetsSeconds: z.number().int().nonnegative().default(60),
     restAfterExerciseSeconds: z.number().int().nonnegative().default(0),
-    notes: z.string().trim().nullable().optional(),
+    notes: z.string().trim().nullable().default(null),
   })
   .strict();