diff --git a/CHANGE_LOG.md b/CHANGE_LOG.md
index 4da1950e8..0a5067ea1 100644
--- a/CHANGE_LOG.md
+++ b/CHANGE_LOG.md
@@ -1,3 +1,42 @@
+## [1.17.1](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.17.0...v1.17.1) (2024-12-03)
+
+
+### Bug Fixes
+
+* add linting command to db package ([#392](https://github.com/oaknational/oak-ai-lesson-assistant/issues/392)) ([d2177d5](https://github.com/oaknational/oak-ai-lesson-assistant/commit/d2177d5c061e973affd1ea52b0ef025c8c37cb29))
+* address sonar major issues ([#393](https://github.com/oaknational/oak-ai-lesson-assistant/issues/393)) ([202a21f](https://github.com/oaknational/oak-ai-lesson-assistant/commit/202a21fbac0d457514c9944735b174c79dced08c))
+* do not define components inline ([#413](https://github.com/oaknational/oak-ai-lesson-assistant/issues/413)) ([abda175](https://github.com/oaknational/oak-ai-lesson-assistant/commit/abda1753afecd9385b19b695767568abdd4383c1))
+* do not use array index for key / use void for onSubmit ([#409](https://github.com/oaknational/oak-ai-lesson-assistant/issues/409)) ([44b5961](https://github.com/oaknational/oak-ai-lesson-assistant/commit/44b59617f3af8cad83110efdc2cb4df23d06e073))
+* help page cloudflare email ([#399](https://github.com/oaknational/oak-ai-lesson-assistant/issues/399)) ([f6262f2](https://github.com/oaknational/oak-ai-lesson-assistant/commit/f6262f26d470a30ea721343bbab2cbfded77b91d))
+* high and medium severity bugs on sonar cloud - AI-637 ([#379](https://github.com/oaknational/oak-ai-lesson-assistant/issues/379)) ([fb0258e](https://github.com/oaknational/oak-ai-lesson-assistant/commit/fb0258ec2f3c0d5fb79d884d3918827460cba404))
+* icons in dialogs ([#398](https://github.com/oaknational/oak-ai-lesson-assistant/issues/398)) ([9700214](https://github.com/oaknational/oak-ai-lesson-assistant/commit/970021462a94b800dba270130f5ba1b1548e8745))
+* intentionality of async / promise code for question generation ([#402](https://github.com/oaknational/oak-ai-lesson-assistant/issues/402)) ([65d1c5f](https://github.com/oaknational/oak-ai-lesson-assistant/commit/65d1c5f89c1b238e24315c02bde2e9eb253b4da3))
+* memoize the sidebar context provider's value ([#408](https://github.com/oaknational/oak-ai-lesson-assistant/issues/408)) ([60ee010](https://github.com/oaknational/oak-ai-lesson-assistant/commit/60ee0102ea1ee733d6527c5460fd404cd7773292))
+* minor sonar issues ([#390](https://github.com/oaknational/oak-ai-lesson-assistant/issues/390)) ([015cd25](https://github.com/oaknational/oak-ai-lesson-assistant/commit/015cd25984c3e5d1a545afef39fd111aa5245d58))
+* prefer nullish coalescing ([#391](https://github.com/oaknational/oak-ai-lesson-assistant/issues/391)) ([b40def9](https://github.com/oaknational/oak-ai-lesson-assistant/commit/b40def9cfd3d69a0089db861a2f6ed47321a3753))
+* readonly props for icons.tsx ([#389](https://github.com/oaknational/oak-ai-lesson-assistant/issues/389)) ([7b4d5bc](https://github.com/oaknational/oak-ai-lesson-assistant/commit/7b4d5bcc508b3179ea5313ec783aba90d1a7f3ae))
+* revert tabindex change ([#404](https://github.com/oaknational/oak-ai-lesson-assistant/issues/404)) ([ac72713](https://github.com/oaknational/oak-ai-lesson-assistant/commit/ac72713dc54595f6bfacfd99e63899616f18b8ec))
+* sonar maintain issues [#4](https://github.com/oaknational/oak-ai-lesson-assistant/issues/4) ([#405](https://github.com/oaknational/oak-ai-lesson-assistant/issues/405)) ([eca0019](https://github.com/oaknational/oak-ai-lesson-assistant/commit/eca001996a684f8d01465196c1c600d00e43a964))
+* sonar maintain linting [#1](https://github.com/oaknational/oak-ai-lesson-assistant/issues/1) ([#394](https://github.com/oaknational/oak-ai-lesson-assistant/issues/394)) ([f4d95fc](https://github.com/oaknational/oak-ai-lesson-assistant/commit/f4d95fcbf39c3c43c3811f8c2022a37af363826a))
+* sonar maintain linting [#2](https://github.com/oaknational/oak-ai-lesson-assistant/issues/2) ([#395](https://github.com/oaknational/oak-ai-lesson-assistant/issues/395)) ([1ed9d60](https://github.com/oaknational/oak-ai-lesson-assistant/commit/1ed9d6028713b096a68a0558d67608dc9efb812f))
+* sonar maintain linting [#3](https://github.com/oaknational/oak-ai-lesson-assistant/issues/3) ([#403](https://github.com/oaknational/oak-ai-lesson-assistant/issues/403)) ([daa7efe](https://github.com/oaknational/oak-ai-lesson-assistant/commit/daa7efe6a2d5d2501f5108cd3c1ccaec86126655))
+* sonar minors [#5](https://github.com/oaknational/oak-ai-lesson-assistant/issues/5) ([#414](https://github.com/oaknational/oak-ai-lesson-assistant/issues/414)) ([5f749f4](https://github.com/oaknational/oak-ai-lesson-assistant/commit/5f749f42f9f5d3d78c736438e313f4f5eff5406b))
+
+# [1.17.0](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.16.2...v1.17.0) (2024-11-28)
+
+
+### Bug Fixes
+
+* assert readonly props ([#381](https://github.com/oaknational/oak-ai-lesson-assistant/issues/381)) ([cd88576](https://github.com/oaknational/oak-ai-lesson-assistant/commit/cd88576c5a337ad30f48783d74ea45d746a60956))
+* help page cloudflare email ([#399](https://github.com/oaknational/oak-ai-lesson-assistant/issues/399)) ([391b67c](https://github.com/oaknational/oak-ai-lesson-assistant/commit/391b67c27a4048d4e422be22226d8d5aa1ac71bd))
+* minor linting ([#384](https://github.com/oaknational/oak-ai-lesson-assistant/issues/384)) ([ec4ce6e](https://github.com/oaknational/oak-ai-lesson-assistant/commit/ec4ce6e5dcc7dbd4e242be65fd3b5f9708b94a40))
+* svg clip-rule should be clipRule in JSX ([#382](https://github.com/oaknational/oak-ai-lesson-assistant/issues/382)) ([610d8c8](https://github.com/oaknational/oak-ai-lesson-assistant/commit/610d8c838273de24212a8531a8bc4b6136c05db1))
+
+
+### Features
+
+* move delete all button and restyle side menu ([#375](https://github.com/oaknational/oak-ai-lesson-assistant/issues/375)) ([69b2371](https://github.com/oaknational/oak-ai-lesson-assistant/commit/69b2371bf9ee7e7f783aa191ba6932dba0171837))
+
 ## [1.16.2](https://github.com/oaknational/oak-ai-lesson-assistant/compare/v1.16.1...v1.16.2) (2024-11-25)
 
 
diff --git a/apps/nextjs/.storybook/preview.tsx b/apps/nextjs/.storybook/preview.tsx
index 428690b9c..99b2ad60e 100644
--- a/apps/nextjs/.storybook/preview.tsx
+++ b/apps/nextjs/.storybook/preview.tsx
@@ -45,7 +45,6 @@ export const decorators: Decorator[] = [
   ClerkDecorator,
   (Story) => (
     <>
-      {/* TODO: Mock tRPC calls with MSW */}
       <TRPCReactProvider>
         <AnalyticsProvider>
           <DialogProvider>
diff --git a/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts b/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
index 5efddcb15..0918104d8 100644
--- a/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
+++ b/apps/nextjs/src/ai-apps/quiz-designer/quizRequestGeneration.ts
@@ -1,11 +1,14 @@
 import type { GenerationPart } from "@oakai/core/src/types";
+import { aiLogger } from "@oakai/logger";
 
 import { getAgesFromKeyStage } from "@/utils/getAgesFromKeyStage";
 
 import { extraQuizPromptInfo } from "./extraQuizPromptInfo";
 import type { QuizAppState, QuizAppStateQuestion } from "./state/types";
 
-type RequestionGenerationInputs = {
+const logger = aiLogger("quiz");
+
+export type RequestionGenerationInputs = {
   lastGenerationId: string | null;
   sessionId: string;
   factQuestion: string;
@@ -26,14 +29,16 @@ type RequestionGenerationInputs = {
   };
 };
 
-type QuizRequestGenerationProps = {
+export type QuizRequestGenerationProps = {
   state: QuizAppState;
   questionRow: QuizAppStateQuestion;
   lastGeneration: GenerationPart<string> | undefined;
-  requestGeneration: (requestionGenInputs: RequestionGenerationInputs) => void;
+  requestGeneration: (
+    requestionGenInputs: RequestionGenerationInputs,
+  ) => Promise<void>;
 };
 
-export function quizRequestGeneration({
+export async function quizRequestGeneration({
   state,
   questionRow,
   requestGeneration,
@@ -47,7 +52,7 @@ export function quizRequestGeneration({
     state,
     questionRow,
   });
-  requestGeneration({
+  await requestGeneration({
     lastGenerationId: lastGeneration?.lastGenerationId ?? null,
     sessionId,
     factQuestion: `${topic}: ${questionRow.question.value}`,
@@ -68,5 +73,7 @@ export function quizRequestGeneration({
         (distractor) => distractor.value,
       ),
     },
+  }).catch((e) => {
+    logger.error(e);
   });
 }
diff --git a/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx b/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
index 8b7174c78..5a2c43b14 100644
--- a/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
+++ b/apps/nextjs/src/app/admin/aila/[chatId]/view.tsx
@@ -7,7 +7,11 @@ import { OakAccordion, OakPrimaryButton } from "@oaknational/oak-components";
 
 import { trpc } from "@/utils/trpc";
 
-function ModerationListItem({ moderation }: { readonly moderation: Moderation }) {
+function ModerationListItem({
+  moderation,
+}: {
+  readonly moderation: Moderation;
+}) {
   const { id, invalidatedAt } = moderation;
   const [invalidated, setInvalidated] = useState(Boolean(invalidatedAt));
   const invalidateModeration = trpc.admin.invalidateModeration.useMutation({
@@ -28,7 +32,7 @@ function ModerationListItem({ moderation }: { readonly moderation: Moderation })
               iconName="cross"
               className="ml-auto"
               onClick={() =>
-                invalidateModeration.mutateAsync({ moderationId: id })
+                void invalidateModeration.mutateAsync({ moderationId: id })
               }
               isLoading={invalidateModeration.isLoading}
               disabled={!!invalidated}
@@ -41,14 +45,16 @@ function ModerationListItem({ moderation }: { readonly moderation: Moderation })
             {moderation.justification}
           </blockquote>
           <div className="mt-2 space-x-2">
-            {moderation.categories.map((category, index) => (
-              <span
-                key={index}
-                className="inline-block rounded-md bg-zinc-300 px-8 py-4 text-xs font-semibold text-zinc-800"
-              >
-                {String(category)}
-              </span>
-            ))}
+            {Array.from(new Set(moderation.categories))
+              .map((c) => String(c))
+              .map((category) => (
+                <span
+                  key={category}
+                  className="inline-block rounded-md bg-zinc-300 px-8 py-4 text-xs font-semibold text-zinc-800"
+                >
+                  {category}
+                </span>
+              ))}
           </div>
         </div>
       </div>
diff --git a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
index 84aa6955e..ec9bcd8d9 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/Chat/ChatModerationDisplay.stories.tsx
@@ -4,7 +4,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { ChatModerationDisplay } from "./ChatModerationDisplay";
 
 const meta: Meta<typeof ChatModerationDisplay> = {
-  title: "Components/Chat/ChatModerationDisplay",
+  title: "Components/Dialogs/ChatModerationDisplay",
   component: ChatModerationDisplay,
   tags: ["autodocs"],
   decorators: [
diff --git a/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx b/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx
index 5c9800993..c5fe3b3bc 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/button-scroll-to-bottom.tsx
@@ -9,7 +9,10 @@ import useAnalytics from "@/lib/analytics/useAnalytics";
 import { useAtBottom } from "@/lib/hooks/use-at-bottom";
 import { cn } from "@/lib/utils";
 
-export function ButtonScrollToBottom({ className, ...props }: ButtonProps) {
+export function ButtonScrollToBottom({
+  className,
+  ...props
+}: Readonly<ButtonProps>) {
   const isAtBottom = useAtBottom();
   const { trackEvent } = useAnalytics();
   return (
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.stories.tsx
new file mode 100644
index 000000000..135fef708
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.stories.tsx
@@ -0,0 +1,25 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatModerationProvider } from "@/components/ContextProviders/ChatModerationContext";
+
+import { DemoLimitMessage } from "./demo-limit-message";
+
+const meta: Meta<typeof DemoLimitMessage> = {
+  title: "Components/Chat/DemoLimitMessage",
+  component: DemoLimitMessage,
+  tags: ["autodocs"],
+  decorators: [
+    (Story) => (
+      <ChatModerationProvider chatId="test-chat-id">
+        <Story />
+      </ChatModerationProvider>
+    ),
+  ],
+};
+
+export default meta;
+type Story = StoryObj<typeof DemoLimitMessage>;
+
+export const Default: Story = {
+  args: {},
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.tsx
new file mode 100644
index 000000000..1bd5393b1
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/demo-limit-message.tsx
@@ -0,0 +1,22 @@
+"use client";
+
+import { ChatMessage } from "@/components/AppComponents/Chat/chat-message";
+
+export function DemoLimitMessage({ id }: Readonly<{ id: string }>) {
+  return (
+    <div className="w-full flex-col gap-11">
+      <ChatMessage
+        chatId={id}
+        ailaStreamingStatus="Idle"
+        message={{
+          id: "demo-limit",
+          role: "assistant",
+          content:
+            '{"type": "error", "message": "**Your lesson is complete**\\nYou can no longer edit this lesson. [Create new lesson.](/aila)"}',
+        }}
+        persistedModerations={[]}
+        separator={<span className="my-10 flex" />}
+      />
+    </div>
+  );
+}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.stories.tsx
new file mode 100644
index 000000000..69a678a93
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.stories.tsx
@@ -0,0 +1,40 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { DemoContext } from "@/components/ContextProviders/Demo";
+
+import { InChatDownloadButtons } from "./in-chat-download-buttons";
+
+const DemoDecorator: Story["decorators"] = (Story, { parameters }) => (
+  <DemoContext.Provider
+    value={{
+      isDemoUser: false,
+      isSharingEnabled: true,
+      ...parameters.demoContext,
+    }}
+  >
+    <Story />
+  </DemoContext.Provider>
+);
+
+const meta: Meta<typeof InChatDownloadButtons> = {
+  title: "Components/Chat/InChatDownloadButtons",
+  component: InChatDownloadButtons,
+  tags: ["autodocs"],
+  args: {
+    id: "test-chat-id",
+  },
+  decorators: [DemoDecorator],
+};
+
+export default meta;
+type Story = StoryObj<typeof InChatDownloadButtons>;
+
+export const Default: Story = {};
+
+export const SharingDisabled: Story = {
+  parameters: {
+    demoContext: {
+      isSharingEnabled: false,
+    },
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.tsx
new file mode 100644
index 000000000..834baf05b
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/in-chat-download-buttons.tsx
@@ -0,0 +1,63 @@
+import { OakBox, OakFlex, OakIcon, OakSpan } from "@oaknational/oak-components";
+import Link from "next/link";
+
+import { useDemoUser } from "@/components/ContextProviders/Demo";
+
+import { useDialog } from "../../DialogContext";
+
+export const InChatDownloadButtons = ({ id }: { readonly id: string }) => {
+  const demo = useDemoUser();
+  const { setDialogWindow } = useDialog();
+
+  return (
+    <OakFlex $flexDirection="column" $gap="all-spacing-7" $mv="space-between-l">
+      {demo.isSharingEnabled && (
+        <Link
+          href={demo.isSharingEnabled ? `/aila/download/${id}` : "#"}
+          onClick={() => {
+            if (!demo.isSharingEnabled) {
+              setDialogWindow("demo-share-locked");
+            }
+          }}
+        >
+          <InnerInChatButton iconName="download">Download</InnerInChatButton>
+        </Link>
+      )}
+      <button
+        onClick={() => {
+          if (demo.isSharingEnabled) {
+            setDialogWindow("share-chat");
+          } else {
+            setDialogWindow("demo-share-locked");
+          }
+        }}
+      >
+        <InnerInChatButton iconName="share">Share</InnerInChatButton>
+      </button>
+    </OakFlex>
+  );
+};
+
+const InnerInChatButton = ({
+  iconName,
+  children,
+}: {
+  readonly iconName: "download" | "share";
+  readonly children: string;
+}) => {
+  return (
+    <OakFlex
+      $pa="inner-padding-m"
+      $gap="all-spacing-3"
+      $background="white"
+      $borderRadius="border-radius-m"
+      $alignItems="center"
+      $dropShadow="drop-shadow-standard"
+    >
+      <OakBox $transform="scale">
+        <OakIcon iconName={iconName} $width="all-spacing-7" />
+      </OakBox>
+      <OakSpan $font="body-2">{children}</OakSpan>
+    </OakFlex>
+  );
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-list/index.tsx
similarity index 70%
rename from apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
rename to apps/nextjs/src/components/AppComponents/Chat/chat-list/index.tsx
index 32b00ee94..49446abc2 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-list.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-list/index.tsx
@@ -1,47 +1,24 @@
 "use client";
 
-import type { Dispatch, SetStateAction } from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { OakBox, OakFlex, OakIcon, OakSpan } from "@oaknational/oak-components";
 import type { Message } from "ai";
-import Link from "next/link";
 
 import { ChatMessage } from "@/components/AppComponents/Chat/chat-message";
 import { useLessonChat } from "@/components/ContextProviders/ChatProvider";
 import type { DemoContextProps } from "@/components/ContextProviders/Demo";
 
-import { useDialog } from "../DialogContext";
-import type { AilaStreamingStatus } from "./Chat/hooks/useAilaStreamingStatus";
-import { useProgressForDownloads } from "./Chat/hooks/useProgressForDownloads";
-import type { DialogTypes } from "./Chat/types";
+import type { AilaStreamingStatus } from "../Chat/hooks/useAilaStreamingStatus";
+import { useProgressForDownloads } from "../Chat/hooks/useProgressForDownloads";
+import { DemoLimitMessage } from "./demo-limit-message";
+import { InChatDownloadButtons } from "./in-chat-download-buttons";
 
 export interface ChatListProps {
   isDemoLocked: boolean;
   showLessonMobile: boolean;
   demo: DemoContextProps;
 }
-
-function DemoLimitMessage({ id }: Readonly<{ id: string }>) {
-  return (
-    <div className="w-full flex-col gap-11">
-      <ChatMessage
-        chatId={id}
-        ailaStreamingStatus="Idle"
-        message={{
-          id: "demo-limit",
-          role: "assistant",
-          content:
-            '{"type": "error", "message": "**Your lesson is complete**\\nYou can no longer edit this lesson. [Create new lesson.](/aila)"}',
-        }}
-        persistedModerations={[]}
-        separator={<span className="my-10 flex" />}
-      />
-    </div>
-  );
-}
-
 export function ChatList({
   isDemoLocked,
   showLessonMobile,
@@ -129,7 +106,6 @@ export const ChatMessagesDisplay = ({
   demo,
 }: ChatMessagesDisplayProps) => {
   const { lessonPlan, isStreaming } = useLessonChat();
-  const { setDialogWindow } = useDialog();
   const { totalSections, totalSectionsComplete } = useProgressForDownloads({
     lessonPlan,
     isStreaming,
@@ -228,71 +204,7 @@ export const ChatMessagesDisplay = ({
             (message.role !== "user" &&
               message.content.includes("download") &&
               message.content.includes("share")),
-        ) && <InChatDownloadButtons {...{ demo, id, setDialogWindow }} />}
+        ) && <InChatDownloadButtons {...{ demo, id }} />}
     </>
   );
 };
-
-const InChatDownloadButtons = ({
-  demo,
-  id,
-  setDialogWindow,
-}: {
-  readonly demo: DemoContextProps;
-  readonly id: string;
-  readonly setDialogWindow: Dispatch<SetStateAction<DialogTypes>>;
-}) => {
-  return (
-    <OakFlex $flexDirection="column" $gap="all-spacing-7" $mv="space-between-l">
-      {demo.isSharingEnabled && (
-        <Link
-          href={demo.isSharingEnabled ? `/aila/download/${id}` : "#"}
-          onClick={() => {
-            if (!demo.isSharingEnabled) {
-              setDialogWindow("demo-share-locked");
-            }
-          }}
-        >
-          <InnerInChatButton iconName="download">Download</InnerInChatButton>
-        </Link>
-      )}
-      <button
-        onClick={() => {
-          if (demo.isSharingEnabled) {
-            setDialogWindow("share-chat");
-          } else {
-            setDialogWindow("demo-share-locked");
-          }
-        }}
-      >
-        <InnerInChatButton iconName="share">Share</InnerInChatButton>
-      </button>
-    </OakFlex>
-  );
-};
-
-const InnerInChatButton = ({
-  iconName,
-
-  children,
-}: {
-  readonly iconName: "download" | "share";
-
-  readonly children: string;
-}) => {
-  return (
-    <OakFlex
-      $pa="inner-padding-m"
-      $gap="all-spacing-3"
-      $background="white"
-      $borderRadius="border-radius-m"
-      $alignItems="center"
-      $dropShadow="drop-shadow-standard"
-    >
-      <OakBox $transform="scale">
-        <OakIcon iconName={iconName} $width="all-spacing-7" />
-      </OakBox>
-      <OakSpan $font="body-2">{children}</OakSpan>
-    </OakFlex>
-  );
-};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.stories.tsx
new file mode 100644
index 000000000..1b97e09bd
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.stories.tsx
@@ -0,0 +1,74 @@
+import { MessagePart } from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatMessagePart } from "./ChatMessagePart";
+
+const meta: Meta<typeof ChatMessagePart> = {
+  title: "Components/Chat/ChatMessagePart",
+  component: ChatMessagePart,
+  tags: ["autodocs"],
+  args: {
+    inspect: false,
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof ChatMessagePart>;
+
+const basePart: Omit<MessagePart, "document"> = {
+  type: "message-part",
+  id: "test-part-id",
+  isPartial: false,
+};
+
+export const PromptMessagePart: Story = {
+  args: {
+    part: {
+      ...basePart,
+      document: {
+        type: "prompt",
+        message:
+          "Are the learning outcome and learning cycles appropriate for your pupils? If not, suggest an edit. Otherwise, tap **Continue** to move on to the next step.",
+      },
+    },
+  },
+};
+
+export const ErrorMessagePart: Story = {
+  args: {
+    part: {
+      ...basePart,
+      document: {
+        type: "error",
+        message:
+          "**Unfortunately you’ve exceeded your fair usage limit for today.** Please come back in 11 hours. If you require a higher limit, please [make a request](https://forms.gle/tHsYMZJR367zydsG8).",
+      },
+    },
+  },
+};
+
+export const TextMessagePart: Story = {
+  args: {
+    part: {
+      ...basePart,
+      document: {
+        type: "text",
+        value:
+          "Are the learning outcome and learning cycles appropriate for your pupils? If not, suggest an edit. Otherwise, tap **Continue** to move on to the next step.",
+      },
+    },
+  },
+};
+
+export const WithInspector: Story = {
+  args: {
+    inspect: true,
+    part: {
+      ...basePart,
+      document: {
+        type: "prompt",
+        message: "This is a prompt",
+      },
+    },
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.tsx
new file mode 100644
index 000000000..e428bb8a3
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/ChatMessagePart.tsx
@@ -0,0 +1,94 @@
+import type {
+  ErrorDocument,
+  MessagePart,
+  PromptDocument,
+  TextDocument,
+} from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import { aiLogger } from "@oakai/logger";
+
+import { MemoizedReactMarkdownWithStyles } from "@/components/AppComponents/Chat/markdown";
+
+import type { ModerationModalHelpers } from "../../FeedbackForms/ModerationFeedbackModal";
+
+const log = aiLogger("chat");
+
+const components = {
+  comment: NonRenderedPart,
+  prompt: PromptMessagePart,
+  error: ErrorMessagePart,
+  bad: NonRenderedPart,
+  patch: NonRenderedPart,
+  /**
+   * Patches do not get rendered, they get applied to the lesson plan
+   * state, which is then rendered in the right hand side.
+   */
+  experimentalPatch: NonRenderedPart,
+  state: NonRenderedPart,
+  text: TextMessagePart,
+  action: NonRenderedPart,
+  moderation: NonRenderedPart,
+  id: NonRenderedPart,
+  unknown: NonRenderedPart,
+};
+
+export interface ChatMessagePartProps {
+  part: MessagePart;
+  inspect: boolean;
+  moderationModalHelpers: ModerationModalHelpers;
+}
+
+export function ChatMessagePart({
+  part,
+  inspect,
+}: Readonly<ChatMessagePartProps>) {
+  const PartComponent = components[part.document.type] as React.ComponentType<{
+    part: typeof part.document;
+  }>;
+
+  if (!PartComponent) {
+    log.info("Unknown part type", part.document.type, JSON.stringify(part));
+    return null;
+  }
+
+  return (
+    <div className="w-full">
+      <PartComponent part={part.document} />
+
+      {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        inspect && <PartInspector part={part} />
+      }
+    </div>
+  );
+}
+
+function NonRenderedPart() {
+  return null;
+}
+
+function PromptMessagePart({ part }: Readonly<{ part: PromptDocument }>) {
+  return <MemoizedReactMarkdownWithStyles markdown={part.message} />;
+}
+
+function ErrorMessagePart({
+  part,
+}: Readonly<{
+  part: ErrorDocument;
+}>) {
+  const markdown = part.message ?? "Sorry, an error has occurred";
+  return <MemoizedReactMarkdownWithStyles markdown={markdown} />;
+}
+
+function TextMessagePart({ part }: Readonly<{ part: TextDocument }>) {
+  return <MemoizedReactMarkdownWithStyles markdown={part.value} />;
+}
+
+function PartInspector({ part }: Readonly<{ part: MessagePart }>) {
+  return (
+    <div className="w-full bg-gray-200 px-8 py-16">
+      <pre className="w-full text-wrap text-xs">
+        {JSON.stringify(part, null, 2)}
+      </pre>
+    </div>
+  );
+}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.stories.tsx
new file mode 100644
index 000000000..1b318e488
--- /dev/null
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.stories.tsx
@@ -0,0 +1,57 @@
+import type { Meta, StoryObj } from "@storybook/react";
+
+import { ChatModerationProvider } from "@/components/ContextProviders/ChatModerationContext";
+
+import { ChatMessage } from "./";
+
+const meta: Meta<typeof ChatMessage> = {
+  title: "Components/Chat/ChatMessage",
+  component: ChatMessage,
+  tags: ["autodocs"],
+  decorators: [
+    (Story) => (
+      <ChatModerationProvider chatId="test-chat-id">
+        <Story />
+      </ChatModerationProvider>
+    ),
+  ],
+  args: {
+    persistedModerations: [],
+  },
+};
+
+export default meta;
+type Story = StoryObj<typeof ChatMessage>;
+
+export const UserMessage: Story = {
+  args: {
+    message: {
+      id: "test-chat-id",
+      content:
+        "Create a lesson plan about the end of Roman Britain for key stage 3 history",
+      role: "user",
+    },
+  },
+};
+
+export const LlmMessage: Story = {
+  args: {
+    message: {
+      id: "test-chat-id",
+      content:
+        '{"type":"llmMessage","sectionsToEdit":["learningOutcome","learningCycles"],"patches":[{"type":"patch","reasoning":"Since there are no existing Oak lessons for this topic, I have created a new lesson plan from scratch focusing on the end of Roman Britain.","value":{"type":"string","op":"add","path":"/learningOutcome","value":"I can explain the reasons behind the decline of Roman Britain and its impact on society."},"status":"complete"},{"type":"patch","reasoning":"I have outlined the learning cycles to break down the lesson structure for teaching about the end of Roman Britain.","value":{"type":"string-array","op":"add","path":"/learningCycles","value":["Identify the key events leading to the end of Roman Britain.","Describe the societal changes that occurred post-Roman withdrawal.","Analyse the archaeological evidence of Roman Britain\'s legacy."]},"status":"complete"}],"sectionsEdited":["learningOutcome","learningCycles"],"prompt":{"type":"text","value":"Are the learning outcome and learning cycles appropriate for your pupils? If not, suggest an edit. Otherwise, tap **Continue** to move on to the next step."},"status":"complete"}',
+      role: "assistant",
+    },
+  },
+};
+
+export const ErrorMessage: Story = {
+  args: {
+    message: {
+      id: "test-chat-id",
+      role: "assistant",
+      content:
+        '{"type":"error","value":"Rate limit exceeded","message":"**Unfortunately you’ve exceeded your fair usage limit for today.** Please come back in 11 hours. If you require a higher limit, please [make a request](https://forms.gle/tHsYMZJR367zydsG8)."}',
+    },
+  },
+};
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
index 6bcab07d9..06359a59c 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-message/index.tsx
@@ -3,23 +3,10 @@
 import type { ReactNode } from "react";
 import { useState } from "react";
 
-import type {
-  ActionDocument,
-  BadDocument,
-  CommentDocument,
-  ErrorDocument,
-  MessagePart,
-  ModerationDocument,
-  PatchDocument,
-  PromptDocument,
-  StateDocument,
-  TextDocument,
-  UnknownDocument,
-} from "@oakai/aila/src/protocol/jsonPatchProtocol";
+import type { MessagePart } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { parseMessageParts } from "@oakai/aila/src/protocol/jsonPatchProtocol";
 import { isSafe } from "@oakai/core/src/utils/ailaModeration/helpers";
 import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModeration/moderationSchema";
-import { aiLogger } from "@oakai/logger";
 import type { Message } from "ai";
 
 import { MemoizedReactMarkdownWithStyles } from "@/components/AppComponents/Chat/markdown";
@@ -27,12 +14,10 @@ import { useChatModeration } from "@/components/ContextProviders/ChatModerationC
 import { Icon } from "@/components/Icon";
 import { cn } from "@/lib/utils";
 
-import type { ModerationModalHelpers } from "../../FeedbackForms/ModerationFeedbackModal";
 import type { AilaStreamingStatus } from "../Chat/hooks/useAilaStreamingStatus";
+import { ChatMessagePart } from "./ChatMessagePart";
 import { isModeration } from "./protocol";
 
-const log = aiLogger("chat");
-
 export interface ChatMessageProps {
   chatId: string; // Needed for when we refactor to use a moderation provider
   message: Message;
@@ -220,130 +205,3 @@ function MessageTextWrapper({ children }: Readonly<{ children: ReactNode }>) {
     </div>
   );
 }
-
-export interface ChatMessagePartProps {
-  part: MessagePart;
-  inspect: boolean;
-  moderationModalHelpers: ModerationModalHelpers;
-}
-
-function ChatMessagePart({
-  part,
-  inspect,
-  moderationModalHelpers,
-}: Readonly<ChatMessagePartProps>) {
-  const PartComponent = {
-    comment: CommentMessagePart,
-    prompt: PromptMessagePart,
-    error: ErrorMessagePart,
-    bad: BadMessagePart,
-    patch: PatchMessagePart,
-    experimentalPatch: ExperimentalPatchMessageComponent,
-    state: StateMessagePart,
-    text: TextMessagePart,
-    action: ActionMessagePart,
-    moderation: ModerationMessagePart,
-    id: IdMessagePart,
-    unknown: UnknownMessagePart,
-  }[part.document.type] as React.ComponentType<{
-    part: typeof part.document;
-    moderationModalHelpers: ModerationModalHelpers;
-  }>;
-
-  if (!PartComponent) {
-    log.info("Unknown part type", part.document.type, JSON.stringify(part));
-    return null;
-  }
-
-  return (
-    <div className="w-full">
-      <PartComponent
-        part={part.document}
-        moderationModalHelpers={moderationModalHelpers}
-      />
-
-      {
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        inspect && <PartInspector part={part} />
-      }
-    </div>
-  );
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function BadMessagePart({ part }: Readonly<{ part: BadDocument }>) {
-  return null;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function CommentMessagePart({ part }: Readonly<{ part: CommentDocument }>) {
-  return null;
-}
-
-function PromptMessagePart({ part }: Readonly<{ part: PromptDocument }>) {
-  return <MemoizedReactMarkdownWithStyles markdown={part.message} />;
-}
-
-function ModerationMessagePart({
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  part,
-}: Readonly<{ part: ModerationDocument }>) {
-  return null;
-}
-
-function ErrorMessagePart({
-  part,
-}: Readonly<{
-  part: ErrorDocument;
-}>) {
-  const markdown = part.message ?? "Sorry, an error has occurred";
-  return <MemoizedReactMarkdownWithStyles markdown={markdown} />;
-}
-
-function TextMessagePart({ part }: Readonly<{ part: TextDocument }>) {
-  return <MemoizedReactMarkdownWithStyles markdown={part.value} />;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function PatchMessagePart({ part }: Readonly<{ part: PatchDocument }>) {
-  return null;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function StateMessagePart({ part }: Readonly<{ part: StateDocument }>) {
-  return null;
-}
-
-function IdMessagePart() {
-  return null;
-}
-
-function ActionMessagePart({
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  part,
-}: Readonly<{ part: ActionDocument }>) {
-  return null;
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-function UnknownMessagePart({ part }: Readonly<{ part: UnknownDocument }>) {
-  return null;
-}
-
-function PartInspector({ part }: Readonly<{ part: MessagePart }>) {
-  return (
-    <div className="w-full bg-gray-200 px-8 py-16">
-      <pre className="w-full text-wrap text-xs">
-        {JSON.stringify(part, null, 2)}
-      </pre>
-    </div>
-  );
-}
-
-/**
- * Patches do not get rendered, they get applied to the lesson plan
- * state, which is then rendered in the right hand side.
- */
-function ExperimentalPatchMessageComponent() {
-  return null;
-}
diff --git a/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx
index f57506495..8ca82763a 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/chat-start-form.stories.tsx
@@ -3,7 +3,7 @@ import type { Meta, StoryObj } from "@storybook/react";
 import { ChatStartForm } from "./chat-start-form";
 
 const meta: Meta<typeof ChatStartForm> = {
-  title: "Components/Chat/ChatStartForm",
+  title: "Components/Chat Start/ChatStartForm",
   component: ChatStartForm,
   tags: ["autodocs"],
 };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
index 8d7b547d3..bae1cc2e9 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/guidance-required.stories.tsx
@@ -23,18 +23,19 @@ export const Default: Story = {
   },
 };
 
-export const CustomClass: Story = {
-  args: {
-    moderation: mockModeration,
-    className: "custom-class",
-  },
-};
-
-export const Safe: Story = {
+export const NoModeration: Story = {
   args: {
     moderation: {
       id: "safe",
       categories: [],
     },
   },
+  decorators: [
+    (Story) => (
+      <>
+        <Story />
+        <p>(Nothing should render here)</p>
+      </>
+    ),
+  ],
 };
diff --git a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
index fcee6eb5b..f50163802 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/markdown.tsx
@@ -1,6 +1,6 @@
 import type { FC } from "react";
-import React, { memo } from "react";
-import type { Options } from "react-markdown";
+import React, { memo, useMemo } from "react";
+import type { Components, Options } from "react-markdown";
 import ReactMarkdown from "react-markdown";
 
 import * as Tooltip from "@radix-ui/react-tooltip";
@@ -24,110 +24,112 @@ export type ReactMarkdownWithStylesProps = Readonly<{
   className?: string;
 }>;
 
+// This could do with further refactoring to make it more readable
+const createComponents = (
+  className?: string,
+  lessonPlanSectionDescription?: string,
+): Partial<Components> => ({
+  li: ({ children }) => (
+    <li className={cn("marker:text-black", className)}>{children}</li>
+  ),
+  p: ({ children }) => (
+    <p className={cn("mb-7 last:mb-0", className)}>{children}</p>
+  ),
+  h1: ({ children }) => (
+    <Flex align="center" gap="3" className="mt-20">
+      <Box>
+        <h2 className="mb-0 mt-0 text-xl font-bold">{children}</h2>
+      </Box>
+      {!!lessonPlanSectionDescription && (
+        <Tooltip.Provider delayDuration={0}>
+          <Tooltip.Root>
+            <Tooltip.Trigger asChild>
+              <Box className="mb-0 mt-0 ">
+                <button className="my-0 flex h-[24px] w-[24px] items-center justify-center overflow-hidden rounded-full bg-black p-4 ">
+                  <span className=" p-3 text-xs text-white">i</span>
+                </button>
+              </Box>
+            </Tooltip.Trigger>
+            <Tooltip.Portal>
+              <Tooltip.Content
+                className="max-w-[300px] rounded-lg bg-black p-7 text-center text-sm text-white"
+                sideOffset={5}
+              >
+                {lessonPlanSectionDescription}
+                <Tooltip.Arrow className="TooltipArrow" />
+              </Tooltip.Content>
+            </Tooltip.Portal>
+          </Tooltip.Root>
+        </Tooltip.Provider>
+      )}
+    </Flex>
+  ),
+  code: (props) => {
+    const {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      node,
+      className,
+      children,
+      inline,
+      ...restProps
+    } = props as {
+      node?: React.ReactNode;
+      inline?: boolean;
+      className?: string;
+      children?: React.ReactNode;
+    };
+    if (children && Array.isArray(children) && children.length) {
+      if (children[0] == "▍") {
+        return <span className="mt-5 animate-pulse cursor-default">▍</span>;
+      }
+
+      children[0] = (children[0] as string).replace("`▍`", "▍");
+    }
+
+    const match = /language-(\w+)/.exec(className ?? "");
+
+    if (inline) {
+      return (
+        <code className={className} {...restProps}>
+          {children}
+        </code>
+      );
+    }
+
+    return (
+      <CodeBlock
+        language={match?.[1] ?? ""}
+        value={String(children).replace(/\n$/, "")}
+        {...restProps}
+      />
+    );
+  },
+  a: ({ children, href }) => {
+    const isExternal = href?.startsWith("http");
+    const tags = isExternal
+      ? { target: "_blank", rel: "noopener noreferrer" }
+      : {};
+    return (
+      <a href={href} {...tags}>
+        {children}
+      </a>
+    );
+  },
+});
+
 export const MemoizedReactMarkdownWithStyles = ({
   markdown,
   lessonPlanSectionDescription,
   className,
 }: ReactMarkdownWithStylesProps) => {
+  const components: Partial<Components> = useMemo(() => {
+    return createComponents(className, lessonPlanSectionDescription);
+  }, [className, lessonPlanSectionDescription]);
   return (
     <MemoizedReactMarkdown
       className="prose break-words dark:prose-invert prose-p:leading-relaxed prose-pre:p-0"
       remarkPlugins={[remarkGfm]}
-      components={{
-        li({ children }) {
-          return (
-            <li className={cn("marker:text-black", className)}>{children}</li>
-          );
-        },
-        p({ children }) {
-          return <p className={cn("mb-7 last:mb-0", className)}>{children}</p>;
-        },
-        h1({ children }) {
-          return (
-            <Flex align="center" gap="3" className="mt-20">
-              <Box>
-                <h2 className="mb-0 mt-0 text-xl font-bold">{children}</h2>
-              </Box>
-              {!!lessonPlanSectionDescription && (
-                <Tooltip.Provider delayDuration={0}>
-                  <Tooltip.Root>
-                    <Tooltip.Trigger asChild>
-                      <Box className="mb-0 mt-0 ">
-                        <button className="my-0 flex h-[24px] w-[24px] items-center justify-center overflow-hidden rounded-full bg-black p-4 ">
-                          <span className=" p-3 text-xs text-white">i</span>
-                        </button>
-                      </Box>
-                    </Tooltip.Trigger>
-                    <Tooltip.Portal>
-                      <Tooltip.Content
-                        className="max-w-[300px] rounded-lg bg-black p-7 text-center text-sm text-white"
-                        sideOffset={5}
-                      >
-                        {lessonPlanSectionDescription}
-                        <Tooltip.Arrow className="TooltipArrow" />
-                      </Tooltip.Content>
-                    </Tooltip.Portal>
-                  </Tooltip.Root>
-                </Tooltip.Provider>
-              )}
-            </Flex>
-          );
-        },
-        code(props) {
-          const {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            node,
-            className,
-            children,
-            inline,
-            ...restProps
-          } = props as {
-            node?: React.ReactNode;
-            inline?: boolean;
-            className?: string;
-            children?: React.ReactNode;
-          };
-          if (children && Array.isArray(children) && children.length) {
-            if (children[0] == "▍") {
-              return (
-                <span className="mt-5 animate-pulse cursor-default">▍</span>
-              );
-            }
-
-            children[0] = (children[0] as string).replace("`▍`", "▍");
-          }
-
-          const match = /language-(\w+)/.exec(className ?? "");
-
-          if (inline) {
-            return (
-              <code className={className} {...restProps}>
-                {children}
-              </code>
-            );
-          }
-
-          return (
-            <CodeBlock
-              key={Math.random()}
-              language={match?.[1] ?? ""}
-              value={String(children).replace(/\n$/, "")}
-              {...restProps}
-            />
-          );
-        },
-        a({ children, href }) {
-          const isExternal = href?.startsWith("http");
-          const tags = isExternal
-            ? { target: "_blank", rel: "noopener noreferrer" }
-            : {};
-          return (
-            <a href={href} {...tags}>
-              {children}
-            </a>
-          );
-        },
-      }}
+      components={components}
     >
       {markdown}
     </MemoizedReactMarkdown>
diff --git a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
index 9ce6ee098..5846852bc 100644
--- a/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
+++ b/apps/nextjs/src/components/AppComponents/Chat/ui/button.tsx
@@ -41,7 +41,7 @@ export interface ButtonProps
   readonly asChild?: boolean;
 }
 
-const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
+const Button = React.forwardRef<HTMLButtonElement, Readonly<ButtonProps>>(
   ({ className, variant, size, asChild = false, ...props }, ref) => {
     const Comp = asChild ? Slot : "button";
     return (
diff --git a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
index e5a072be0..c77be1132 100644
--- a/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
+++ b/apps/nextjs/src/components/AppComponents/FeedbackForms/ModerationFeedbackForm.tsx
@@ -59,7 +59,12 @@ export const ModerationFeedbackForm = ({
           </span>
         </Dialog.Description>
       </div>
-      <form onSubmit={onSubmit}>
+      <form
+        onSubmit={(e) => {
+          e.preventDefault();
+          void onSubmit();
+        }}
+      >
         <Textarea
           className="min-h-30 w-full resize-none rounded border border-gray-600 bg-transparent px-10 py-[0.6rem] text-base placeholder-gray-700 focus-within:outline-none"
           onChange={(e) => setComment(e.target.value)}
@@ -71,7 +76,13 @@ export const ModerationFeedbackForm = ({
         <ChatButton variant="text-link" onClick={closeModal}>
           Back to lesson
         </ChatButton>
-        <ChatButton variant="primary" onClick={onSubmit} disabled={!isValid}>
+        <ChatButton
+          variant="primary"
+          onClick={() => {
+            void onSubmit();
+          }}
+          disabled={!isValid}
+        >
           Submit feedback
         </ChatButton>
       </div>
diff --git a/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx b/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx
index 7886ebe42..64d30b136 100644
--- a/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx
+++ b/apps/nextjs/src/components/AppComponents/GetInTouchBox.tsx
@@ -42,11 +42,11 @@ const GetInTouchBox = () => {
         </svg>
       </div>
       <p>
-        Can’t find what you need?{" "}
+        {"Can’t find what you need? "}
         <a href={email} className="text-blue underline">
           Get in touch
         </a>
-        , we’d be happy to help.
+        {", we’d be happy to help."}
       </p>
     </div>
   );
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
index cd739f83d..83a17da02 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Answers.tsx
@@ -41,42 +41,37 @@ const Answers = ({
   const [userIsEditing, setUserIsEditing] = useState(false);
 
   return (
-    <>
-      <Box>
-        {!isLoading && (
-          <>
-            {questionRow.answers.map((answer, answerIdx) => {
-              return (
-                <Skeleton loaded={true} key={answer.value}>
-                  <Flex direction="row" className="w-full">
-                    <Box className="h-fit w-fit" mr="3" mt="2">
-                      <Box className="flex scale-75 items-center justify-center rounded-full bg-pupilsHighlight p-6">
-                        <Icon icon="tick" size="sm" />
-                      </Box>
-                    </Box>
-                    <Box className="w-full max-w-[90%]">
-                      <Answer
-                        setUserIsEditing={setUserIsEditing}
-                        questionIdx={questionIdx}
-                        questionRow={questionRow}
-                        state={state}
-                        isLoading={isLoading}
-                        userIsEditing={userIsEditing}
-                        answerIdx={answerIdx}
-                        dispatch={dispatch}
-                        answer={answer}
-                      />
-                    </Box>
-                  </Flex>
-                </Skeleton>
-              );
-            })}
-          </>
-        )}
+    <Box>
+      {!isLoading &&
+        questionRow.answers.map((answer, answerIdx) => {
+          return (
+            <Skeleton loaded={true} key={answer.value}>
+              <Flex direction="row" className="w-full">
+                <Box className="h-fit w-fit" mr="3" mt="2">
+                  <Box className="flex scale-75 items-center justify-center rounded-full bg-pupilsHighlight p-6">
+                    <Icon icon="tick" size="sm" />
+                  </Box>
+                </Box>
+                <Box className="w-full max-w-[90%]">
+                  <Answer
+                    setUserIsEditing={setUserIsEditing}
+                    questionIdx={questionIdx}
+                    questionRow={questionRow}
+                    state={state}
+                    isLoading={isLoading}
+                    userIsEditing={userIsEditing}
+                    answerIdx={answerIdx}
+                    dispatch={dispatch}
+                    answer={answer}
+                  />
+                </Box>
+              </Flex>
+            </Skeleton>
+          );
+        })}
 
-        {hasError && error && <GenerationErrorBox error={error} />}
-      </Box>
-    </>
+      {hasError && error && <GenerationErrorBox error={error} />}
+    </Box>
   );
 };
 
diff --git a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
index 13b0272ef..9a62ef498 100644
--- a/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
+++ b/apps/nextjs/src/components/AppComponents/QuizDesigner/QuizQuestionRow/Question.tsx
@@ -76,13 +76,13 @@ const Question = ({
   const medianTimeTakenForPrompt =
     promptTimings.data?.["median-generation-total-duration-ms"];
 
-  const requestAnswersAndDistractorGeneration = useCallback(() => {
+  const requestAnswersAndDistractorGeneration = useCallback(async () => {
     const lastGeneration = [
       ...questionRow.answers,
       ...questionRow.distractors,
     ].find((answer) => Boolean(answer.lastGenerationId));
 
-    quizRequestGeneration({
+    await quizRequestGeneration({
       state,
       questionRow,
       requestGeneration,
@@ -101,7 +101,7 @@ const Question = ({
       onSubmit={(e) => {
         e.preventDefault();
         if (canGenerate) {
-          requestAnswersAndDistractorGeneration();
+          void requestAnswersAndDistractorGeneration();
         }
       }}
       className="w-full"
@@ -146,7 +146,7 @@ const Question = ({
                    * regenerate all prompt currently
                    */
                   if (canGenerate) {
-                    requestAnswersAndDistractorGeneration();
+                    void requestAnswersAndDistractorGeneration();
                   }
                 }}
                 disabled={!canGenerate}
@@ -161,7 +161,7 @@ const Question = ({
                 buttonText="Generate answers & distractors"
                 onClick={() => {
                   if (canGenerate) {
-                    requestAnswersAndDistractorGeneration();
+                    void requestAnswersAndDistractorGeneration();
                     suggestedQuestionsGeneration();
                   }
                 }}
diff --git a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
index e8727e486..52870af67 100644
--- a/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
+++ b/apps/nextjs/src/components/AppComponents/download/DownloadButton.tsx
@@ -121,10 +121,10 @@ export const DownloadButton = ({
         </Link>
         <button
           className="flex w-full items-center  justify-start gap-15 hover:underline sm:hidden"
-          onClick={async () => {
+          onClick={() => {
             const lessonTitle = lesson.title;
             if (!lessonTitle) return;
-            mutateAsync({
+            void mutateAsync({
               lessonTitle,
               title,
               link,
@@ -150,10 +150,14 @@ export const DownloadButton = ({
       </div>
     );
   }
+
+  const downloadButtonClasses = downloadAvailable
+    ? `border-opacity-100`
+    : ` border-opacity-40`;
   return (
     <>
       <button
-        className={`flex items-center justify-between gap-9 rounded-md border-2 border-black px-14 py-10 ${downloadAvailable ? `border-opacity-100` : ` border-opacity-40`}`}
+        className={`flex items-center justify-between gap-9 rounded-md border-2 border-black px-14 py-10 ${downloadButtonClasses}`}
         onClick={() => onClick()}
         disabled={!downloadAvailable}
         data-testid={dataTestId}
diff --git a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
index 464859305..54c5f1d8b 100644
--- a/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
+++ b/apps/nextjs/src/components/ContextProviders/ChatProvider.tsx
@@ -20,11 +20,10 @@ import type { PersistedModerationBase } from "@oakai/core/src/utils/ailaModerati
 import type { Moderation } from "@oakai/db";
 import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
-import type { Message } from "ai";
-import { nanoid } from "ai";
-import type { ChatRequestOptions, CreateMessage } from "ai";
+import type { ChatRequestOptions, CreateMessage, Message } from "ai";
 import { useChat } from "ai/react";
 import { useTemporaryLessonPlanWithStreamingEdits } from "hooks/useTemporaryLessonPlanWithStreamingEdits";
+import { nanoid } from "nanoid";
 import { redirect, usePathname, useRouter } from "next/navigation";
 
 import { useLessonPlanTracking } from "@/lib/analytics/lessonPlanTrackingContext";
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx
index 4f7315b54..2f033ae50 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/DemoInterstitialDialog.tsx
@@ -59,7 +59,7 @@ const CreatingChatDialog = ({
     }
   }, [isSubmitting, demo]);
 
-  const createAppSession = useCallback(async () => {
+  const createAppSession = useCallback(() => {
     if (!submit) {
       throw new Error("DemoInterstitialDialog requires a submit function");
     }
@@ -67,7 +67,7 @@ const CreatingChatDialog = ({
     setIsSubmitting(true);
 
     try {
-      await submit();
+      submit();
     } catch (error) {
       log.error("Error creating demo lesson:", error);
       setIsSubmitting(false);
diff --git a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
index 2c8b30561..351ad512d 100644
--- a/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
+++ b/apps/nextjs/src/components/DialogControl/ContentOptions/ReportContentDialog.tsx
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useCallback, useState } from "react";
 
 import { aiLogger } from "@oakai/logger";
 import {
@@ -36,35 +36,49 @@ const ReportContentDialog = ({
       surveyName: "Report Content",
     });
 
-  function close() {
+  const close = useCallback(() =>{
     closeDialog();
     closeDialogWithPostHogDismiss();
-  }
+  }, [closeDialog, closeDialogWithPostHogDismiss]);
 
-  async function onSubmit(e?: React.FormEvent<HTMLFormElement>) {
-    log.info("submitting");
-    e?.preventDefault();
-    setUserHasSubmitted(true);
-    submitSurveyWithOutClosing({
-      //Messages Array
-      $survey_response: messages ?? "No chat history",
-      // Last Message Id
-      $survey_response_1: messages
-        ? messages[messages.length - 1]?.id
-        : "No chat history",
-      // Chat Id
-      $survey_response_2: chatId,
-      // Comment
-      $survey_response_3: userInput,
-    });
-    setUserInput("");
-  }
+  const onSubmit = useCallback(
+    (
+      e?:
+        | React.FormEvent<HTMLFormElement>
+        | React.MouseEvent<HTMLButtonElement>,
+    ) => {
+      log.info("submitting");
+      e?.preventDefault();
+      setUserHasSubmitted(true);
+      submitSurveyWithOutClosing({
+        //Messages Array
+        $survey_response: messages ?? "No chat history",
+        // Last Message Id
+        $survey_response_1: messages
+          ? messages[messages.length - 1]?.id
+          : "No chat history",
+        // Chat Id
+        $survey_response_2: chatId,
+        // Comment
+        $survey_response_3: userInput,
+      });
+      setUserInput("");
+    },
+    [chatId, messages, submitSurveyWithOutClosing, userInput],
+  );
+
+  const actionButtonStates = useCallback(
+    () => (
+      <OakPrimaryButton onClick={onSubmit}>Submit feedback</OakPrimaryButton>
+    ),
+    [onSubmit],
+  );
 
   return (
     <Flex className="h-full w-full" direction="column" justify="between">
       <form
         className="flex flex-col gap-14"
-        onSubmit={async (e) => {
+        onSubmit={(e) => {
           e.preventDefault();
         }}
       >
@@ -94,11 +108,7 @@ const ReportContentDialog = ({
             />
 
             <ModalFooterButtons
-              actionButtonStates={() => (
-                <OakPrimaryButton onClick={() => onSubmit()}>
-                  Submit feedback
-                </OakPrimaryButton>
-              )}
+              actionButtonStates={actionButtonStates}
               closeDialog={close}
             />
           </>
diff --git a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
index dab5a6028..c80a1966f 100644
--- a/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
+++ b/apps/nextjs/src/components/ExportsDialogs/useExportQuizDoc.ts
@@ -1,7 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from "react";
 
 import { exportDocQuizSchema } from "@oakai/exports/browser";
-import type { QuizDocInputData } from "@oakai/exports/src/schema/input.schema";
+import type {
+  LessonDeepPartial,
+  QuizDocInputData,
+} from "@oakai/exports/src/schema/input.schema";
 import * as Sentry from "@sentry/nextjs";
 import { useDebounce } from "@uidotdev/usehooks";
 import type { ZodError } from "zod";
@@ -11,6 +14,18 @@ import { trpc } from "@/utils/trpc";
 import type { ExportsHookProps } from "./exports.types";
 import { useExportsExistenceCheck } from "./useExportsExistenceCheck";
 
+function extractQuizFromLesson(
+  lesson: LessonDeepPartial,
+  quizType: "exit" | "starter",
+) {
+  switch (quizType) {
+    case "starter":
+      return lesson._experimental_starterQuizMathsV0 ?? lesson.starterQuiz;
+    case "exit":
+      return lesson._experimental_exitQuizMathsV0 ?? lesson.exitQuiz;
+  }
+}
+
 export function useExportQuizDoc({
   onStart,
   quizType,
@@ -21,7 +36,7 @@ export function useExportQuizDoc({
 }: ExportsHookProps<{ quizType: "exit" | "starter" }>) {
   const [dialogOpen, setDialogOpen] = useState(false);
   const query = trpc.exports.exportQuizDoc.useMutation();
-  const quiz = quizType === "exit" ? lesson.exitQuiz : lesson.starterQuiz;
+  const quiz = extractQuizFromLesson(lesson, quizType);
   const [parseResult, setParseResult] = useState<
     { data?: QuizDocInputData; success: boolean; error?: ZodError } | undefined
   >({ success: false });
diff --git a/apps/nextjs/src/hooks/useRegenerateAnswers.ts b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
index 35fff7d90..bfe695c85 100644
--- a/apps/nextjs/src/hooks/useRegenerateAnswers.ts
+++ b/apps/nextjs/src/hooks/useRegenerateAnswers.ts
@@ -59,7 +59,7 @@ const useRegenerateAnswers = ({
     Boolean(answer.lastGenerationId),
   );
   const requestRegenerateAnswersGeneration = useCallback(() => {
-    quizRequestGeneration({
+    void quizRequestGeneration({
       state,
       questionRow,
       requestGeneration,
diff --git a/apps/nextjs/src/hooks/useRegenerateDistractors.ts b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
index d8c7466e5..8c18263dc 100644
--- a/apps/nextjs/src/hooks/useRegenerateDistractors.ts
+++ b/apps/nextjs/src/hooks/useRegenerateDistractors.ts
@@ -54,7 +54,7 @@ const useRegenerateDistractors = ({
     Boolean(distractor.lastGenerationId),
   );
   const requestRegenerateAllDistractorsGeneration = useCallback(() => {
-    quizRequestGeneration({
+    void quizRequestGeneration({
       state,
       questionRow,
       requestGeneration,
diff --git a/apps/nextjs/src/lib/hooks/use-sidebar.tsx b/apps/nextjs/src/lib/hooks/use-sidebar.tsx
index 176feded9..b95c386ad 100644
--- a/apps/nextjs/src/lib/hooks/use-sidebar.tsx
+++ b/apps/nextjs/src/lib/hooks/use-sidebar.tsx
@@ -1,55 +1,62 @@
 "use client";
 
-import * as React from "react";
+import {
+  createContext,
+  useContext,
+  useMemo,
+  useState,
+  useEffect,
+  useCallback,
+} from "react";
 
 const LOCAL_STORAGE_KEY = "sidebar";
 
-interface SidebarContext {
+export interface SidebarContext {
   isSidebarOpen: boolean;
   toggleSidebar: () => void;
   isLoading: boolean;
 }
 
-const SidebarContext = React.createContext<SidebarContext | undefined>(
-  undefined,
-);
+const SidebarContext = createContext<SidebarContext | undefined>(undefined);
 
 export function useSidebar() {
-  const context = React.useContext(SidebarContext);
+  const context = useContext(SidebarContext);
   if (!context) {
     throw new Error("useSidebarContext must be used within a SidebarProvider");
   }
   return context;
 }
 
-interface SidebarProviderProps {
+export interface SidebarProviderProps {
   readonly children: React.ReactNode;
 }
 
 export function SidebarProvider({ children }: SidebarProviderProps) {
-  const [isSidebarOpen, setSidebarOpen] = React.useState(false);
-  const [isLoading, setLoading] = React.useState(true);
+  const [isSidebarOpen, setIsSidebarOpen] = useState(false);
+  const [isLoading, setIsLoading] = useState(true);
 
-  React.useEffect(() => {
+  useEffect(() => {
     const value = localStorage.getItem(LOCAL_STORAGE_KEY);
     if (value) {
-      setSidebarOpen(false);
+      setIsSidebarOpen(false);
     }
-    setLoading(false);
+    setIsLoading(false);
   }, []);
 
-  const toggleSidebar = () => {
-    setSidebarOpen((value) => {
+  const toggleSidebar = useCallback(() => {
+    setIsSidebarOpen((value) => {
       const newState = !value;
       localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(newState));
       return newState;
     });
-  };
+  }, [setIsSidebarOpen]);
+
+  const contextValue = useMemo(() => {
+    return { isSidebarOpen, toggleSidebar, isLoading };
+  }, [isSidebarOpen, isLoading, toggleSidebar]);
 
   return (
-    <SidebarContext.Provider
-      value={{ isSidebarOpen, toggleSidebar, isLoading }}
-    >
+    <SidebarContext.Provider value={contextValue}>
       {children}
     </SidebarContext.Provider>
   );
diff --git a/packages/aila/src/core/chat/AilaChat.ts b/packages/aila/src/core/chat/AilaChat.ts
index a11d13de3..0143d1627 100644
--- a/packages/aila/src/core/chat/AilaChat.ts
+++ b/packages/aila/src/core/chat/AilaChat.ts
@@ -16,6 +16,7 @@ import type {
   JsonPatchDocumentOptional,
 } from "../../protocol/jsonPatchProtocol";
 import {
+  extractPatches,
   LLMMessageSchema,
   parseMessageParts,
 } from "../../protocol/jsonPatchProtocol";
@@ -279,7 +280,10 @@ export class AilaChat implements AilaChatService {
   private applyExperimentalPatches() {
     const experimentalPatches = this._experimentalPatches;
 
-    log.info("Applying experimental patches", experimentalPatches);
+    log.info(
+      "Applying experimental extractAndApplyLlmPatches",
+      experimentalPatches,
+    );
 
     this._aila.lesson.applyValidPatches(experimentalPatches);
   }
@@ -383,11 +387,12 @@ export class AilaChat implements AilaChatService {
     await this.reportUsageMetrics();
     await fetchExperimentalPatches({
       lessonPlan: this._aila.lesson.plan,
-      parsedMessages: this.parsedMessages,
+      llmPatches: extractPatches(this.accumulatedText()).validPatches,
       handlePatch: async (patch) => {
         await this.enqueue(patch);
         this.appendExperimentalPatch(patch);
       },
+      userId: this._userId,
     });
     this.applyEdits();
     const assistantMessage = this.appendAssistantMessage();
diff --git a/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts b/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts
index c41b38158..374ba7416 100644
--- a/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts
+++ b/packages/aila/src/utils/experimentalPatches/fetchExperimentalPatches.ts
@@ -1,9 +1,14 @@
+import { posthogAiBetaServerClient } from "@oakai/core/src/analytics/posthogAiBetaServerClient";
+import { aiLogger } from "@oakai/logger";
+
 import type {
   ExperimentalPatchDocument,
-  MessagePart,
   PatchDocument,
 } from "../../protocol/jsonPatchProtocol";
 import type { LooseLessonPlan, Quiz } from "../../protocol/schema";
+import { mathsQuizFixture } from "./mathsQuiz.fixture";
+
+const log = aiLogger("aila:experimental-patches");
 
 /**
  * Wrap a value in an experimental patch 'document'
@@ -22,24 +27,42 @@ function preparePatch(
  */
 export async function fetchExperimentalPatches({
   lessonPlan,
-  parsedMessages,
+  llmPatches,
   handlePatch,
+  userId,
 }: {
   lessonPlan: LooseLessonPlan;
-  parsedMessages: MessagePart[][];
+  llmPatches: PatchDocument[];
   handlePatch: (patch: ExperimentalPatchDocument) => Promise<void>;
+  userId?: string;
 }) {
-  if (lessonPlan.subject === "maths") {
+  if (lessonPlan.subject !== "maths") {
     // Only maths has experimental patches for now
     return;
   }
 
-  const patches = parsedMessages
-    .map((m) => m.map((p) => p.document))
-    .flat()
-    .filter((p): p is PatchDocument => p.type === "patch");
+  if (!userId) {
+    log.info("Experimental patches disabled or no user ID. Skipping.");
+    return;
+  }
+
+  const mathsQuizzesEnabled = await posthogAiBetaServerClient.isFeatureEnabled(
+    "maths-quiz-v0",
+    userId,
+  );
+
+  if (!mathsQuizzesEnabled) {
+    log.info("Maths quiz feature-flag disabled. Skipping.");
+    return;
+  }
+
+  log.info(
+    "Maths quiz feature-flag enabled for user. Fetching experimental quiz patches.",
+  );
 
-  const starterQuizPatch = patches.find((p) => p.value.path === "/starterQuiz");
+  const starterQuizPatch = llmPatches.find(
+    (p) => p.value.path === "/starterQuiz",
+  );
 
   if (starterQuizPatch) {
     const op = starterQuizPatch.value.op;
@@ -51,7 +74,7 @@ export async function fetchExperimentalPatches({
         }),
       );
     } else {
-      const mathsStarterQuiz: Quiz | null = null;
+      const mathsStarterQuiz: Quiz | null = mathsQuizFixture;
       if (mathsStarterQuiz) {
         await handlePatch(
           preparePatch({
@@ -64,7 +87,7 @@ export async function fetchExperimentalPatches({
     }
   }
 
-  const exitQuizPatch = patches.find((p) => p.value.path === "/exitQuiz");
+  const exitQuizPatch = llmPatches.find((p) => p.value.path === "/exitQuiz");
 
   if (exitQuizPatch) {
     const op = exitQuizPatch.value.op;
@@ -76,7 +99,7 @@ export async function fetchExperimentalPatches({
         }),
       );
     } else {
-      const mathsExitQuiz: Quiz | null = null;
+      const mathsExitQuiz: Quiz | null = mathsQuizFixture;
       if (mathsExitQuiz) {
         await handlePatch(
           preparePatch({
diff --git a/packages/aila/src/utils/experimentalPatches/mathsQuiz.fixture.ts b/packages/aila/src/utils/experimentalPatches/mathsQuiz.fixture.ts
new file mode 100644
index 000000000..281b27ed9
--- /dev/null
+++ b/packages/aila/src/utils/experimentalPatches/mathsQuiz.fixture.ts
@@ -0,0 +1,58 @@
+import type { Quiz } from "../../protocol/schema";
+
+export const mathsQuizFixture: Quiz = [
+  {
+    question: "How many degrees in 2 right angles?",
+    answers: ["180°"],
+    distractors: ["60°", "90°"],
+  },
+  {
+    question:
+      "Two shapes are {{}} if the only difference between them is their size.",
+    answers: ["similar"],
+    distractors: [
+      "No distractors for short answer",
+      "No distractors for short answer",
+    ],
+  },
+  {
+    question:
+      "A fruit stall is having a sale. It sells cherries in boxes of four pairs. How many cherries are there in six packs? There will be {{ }} in six packs.",
+    answers: ["24"],
+    distractors: [
+      "No distractors for short answer",
+      "No distractors for short answer",
+    ],
+  },
+  {
+    question:
+      "In which image is the circumference labelled with a question mark?",
+    answers: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/fg4uyx41rfnksbvav2nh.png)",
+    ],
+    distractors: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703163380/pz6cn5k4wmowycnjq5am.png)",
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/mr09mrwkqdtk1dvjdoi0.png)",
+    ],
+  },
+  {
+    question:
+      "Complete the statement. Triangle ABC and triangle XYZ are ____________. ![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1706110974/fukcqeavzcevgjhmm1n4.png)",
+    answers: ["similar as the three interior angles are the same."],
+    distractors: [
+      "congruent as the three interior angles are all the same.",
+      "neither similar nor congruent.",
+    ],
+  },
+  {
+    question:
+      "Here is an image ![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1706110974/fukcqeavzcevgjhmm1n4.png) and here is the same image  ![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1706110974/fukcqeavzcevgjhmm1n4.png)",
+    answers: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/fg4uyx41rfnksbvav2nh.png)",
+    ],
+    distractors: [
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703163380/pz6cn5k4wmowycnjq5am.png)",
+      "![image](http://oaknationalacademy-res.cloudinary.com/image/upload/v1703169784/mr09mrwkqdtk1dvjdoi0.png)",
+    ],
+  },
+];
diff --git a/packages/api/src/export/exportQuizDoc.ts b/packages/api/src/export/exportQuizDoc.ts
index 640273a14..e7472ac7b 100644
--- a/packages/api/src/export/exportQuizDoc.ts
+++ b/packages/api/src/export/exportQuizDoc.ts
@@ -8,8 +8,7 @@ import { aiLogger } from "@oakai/logger";
 import * as Sentry from "@sentry/nextjs";
 import { z } from "zod";
 
-import type {
-  OutputSchema} from "../router/exports";
+import type { OutputSchema } from "../router/exports";
 import {
   ailaGetExportBySnapshotId,
   ailaSaveExport,
diff --git a/packages/api/src/router/lesson.ts b/packages/api/src/router/lesson.ts
index 463aeddb9..062c70b78 100644
--- a/packages/api/src/router/lesson.ts
+++ b/packages/api/src/router/lesson.ts
@@ -160,7 +160,7 @@ export const lessonRouter = router({
         },
       });
 
-      if (!res || !res.summaries[0]) {
+      if (!res?.summaries?.[0]) {
         throw new TRPCError({
           message: "Lesson not found",
           code: "NOT_FOUND",
@@ -218,7 +218,7 @@ export const lessonRouter = router({
         where: { lessonId: lesson.id, variant: "ORIGINAL" },
         cacheStrategy: { ttl: 60 * 5, swr: 60 * 2 },
       });
-      if (!transcript || !transcript.content) {
+      if (!transcript?.content) {
         throw new TRPCError({
           message: "Transcript not found",
           code: "NOT_FOUND",
diff --git a/packages/core/index.ts b/packages/core/index.ts
index 597d7e888..d4a2266b6 100644
--- a/packages/core/index.ts
+++ b/packages/core/index.ts
@@ -11,8 +11,6 @@ import { generateAllLessonPlans } from "./src/functions/lessonPlan/generateAll";
 import { processLessonPlan } from "./src/functions/lessonPlan/process";
 import { embedLessonSummary } from "./src/functions/lessonSummary/embed";
 import { embedAllLessonSummaries } from "./src/functions/lessonSummary/embedAll";
-import { addIdsToMessages } from "./src/functions/migrations/addIdsToMessages";
-import { kvChatsToPrisma } from "./src/functions/migrations/kvChatsToPrisma";
 import { embedAllQuizAnswers } from "./src/functions/quizAnswer/embedAll";
 import { generateQuizAnswerEmbeddings } from "./src/functions/quizAnswer/generateQuizAnswerEmbeddings";
 import { embedAllQuizQuestions } from "./src/functions/quizQuestion/embedAll";
@@ -63,8 +61,6 @@ export const functions = [
   processLessonPlan,
   generatePlanForLesson,
   generateAllLessonPlans,
-  kvChatsToPrisma,
-  addIdsToMessages,
   notifyModeration,
   notifyRateLimit,
   notifyUserBan,
diff --git a/packages/core/src/functions/event-types.ts b/packages/core/src/functions/event-types.ts
index 7a83f3cd5..657e0e47d 100644
--- a/packages/core/src/functions/event-types.ts
+++ b/packages/core/src/functions/event-types.ts
@@ -14,8 +14,6 @@ import { generateAllLessonPlansSchema } from "./lessonPlan/generateAll.schema";
 import { processLessonPlanSchema } from "./lessonPlan/process.schema";
 import { embedLessonSummarySchema } from "./lessonSummary/embed.schema";
 import { embedAllLessonSummariesSchema } from "./lessonSummary/embedAll.schema";
-import { addIdsToMessagesSchema } from "./migrations/addIdsToMessages.schema";
-import { kvChatsToPrismaSchema } from "./migrations/kvChatsToPrisma.schema";
 import { embedAllQuizAnswersSchema } from "./quizAnswer/embedAll.schema";
 import { embedQuizAnswerSchema } from "./quizAnswer/generateQuizAnswerEmbeddings.schema";
 import { embedAllQuizQuestionsSchema } from "./quizQuestion/embedAll.schema";
@@ -63,8 +61,6 @@ const schemas = {
   "app/lessonPlan.embedPart": embedLessonPlanPartSchema,
   "app/snippet.embedAll": embedAllSnippetsSchema,
   "app/snippet.generateForAllQuestions": generateSnippetsForAllQuestionsSchema,
-  "app/migrations.kvChatsToPrisma": kvChatsToPrismaSchema,
-  "app/migrations.addIdsToMessages": addIdsToMessagesSchema,
   "app/slack.notifyRateLimit": notifyRateLimitSchema,
   "app/slack.notifyModeration": notifyModerationSchema,
   "app/slack.notifyUserBan": notifyUserBanSchema,
diff --git a/packages/core/src/functions/migrations/addIdsToMessages.schema.ts b/packages/core/src/functions/migrations/addIdsToMessages.schema.ts
deleted file mode 100644
index f0fe7388f..000000000
--- a/packages/core/src/functions/migrations/addIdsToMessages.schema.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { z } from "zod";
-
-export const addIdsToMessagesSchema = {
-  data: z.object({
-    dryRun: z.boolean().default(true),
-  }),
-};
diff --git a/packages/core/src/functions/migrations/addIdsToMessages.ts b/packages/core/src/functions/migrations/addIdsToMessages.ts
deleted file mode 100644
index 5ca7c4577..000000000
--- a/packages/core/src/functions/migrations/addIdsToMessages.ts
+++ /dev/null
@@ -1,129 +0,0 @@
-import { Prisma, prisma } from "@oakai/db";
-import crypto from "crypto";
-import { z } from "zod";
-
-import { inngest } from "../../inngest";
-import { addIdsToMessagesSchema } from "./addIdsToMessages.schema";
-
-const chatSchema = z
-  .object({
-    messages: z.array(
-      z
-        .object({
-          id: z.string().optional(),
-          content: z.string(),
-        })
-        .passthrough(),
-    ),
-  })
-  .passthrough();
-
-/**
- * Generate a unique message ID based on the message content.
- */
-export function getMessageId(message: { content: string }) {
-  return crypto
-    .createHash("sha256")
-    .update(message.content)
-    .digest("hex")
-    .slice(0, 16);
-}
-
-export const addIdsToMessages = inngest.createFunction(
-  {
-    name: "Add ids to messages in AppSessions",
-    id: "add-ids-to-messages",
-  },
-  { event: "app/migrations.addIdsToMessages" },
-  async ({ event, step }) => {
-    const args = addIdsToMessagesSchema.data.parse(event.data);
-    const DRY_RUN = args.dryRun;
-
-    if (DRY_RUN) {
-      console.log("Running in dry run mode");
-    }
-
-    async function migrateAppSession(appSession: {
-      id: string;
-      output: Prisma.JsonValue;
-    }) {
-      const parseResult = chatSchema.safeParse(appSession.output);
-      if (!parseResult.success) {
-        console.log(appSession.id, "- Invalid chat schema");
-        console.error(parseResult.error.issues);
-        return;
-      }
-
-      const chat = parseResult.data;
-      const messagesWithoutIds = chat.messages.filter((message) => !message.id);
-
-      if (messagesWithoutIds.length === 0) {
-        console.log(appSession.id, "- No messages without ids");
-        return;
-      }
-
-      console.log(appSession.id, "- Found messages without ids");
-
-      messagesWithoutIds.forEach((message, index) => {
-        const id = getMessageId(message);
-        console.log(appSession.id, "- Adding id to message", index, id);
-        message.id = id;
-      });
-
-      console.log(appSession.id, "- Updating appSession with ids");
-      if (!DRY_RUN) {
-        await prisma.appSession.update({
-          where: {
-            id: appSession.id,
-          },
-          data: {
-            output: chat,
-          },
-        });
-      }
-    }
-
-    let cursor: string | null = null;
-
-    while (true) {
-      cursor = await step.run("Process page", async () => {
-        console.log("Cursor:", cursor);
-        const appSessions: Array<{ id: string; output: Prisma.JsonValue }> =
-          await prisma.appSession.findMany({
-            where: {
-              appId: "lesson-planner",
-              output: { not: Prisma.JsonNull },
-            },
-            select: {
-              id: true,
-              output: true,
-            },
-            ...(cursor ? { cursor: { id: cursor }, skip: 1 } : undefined),
-            take: 20,
-            orderBy: {
-              id: "asc",
-            },
-          });
-
-        const last = appSessions[appSessions.length - 1];
-        if (!last) {
-          console.log("No more appSessions");
-          return null;
-        }
-        console.log(`Found ${appSessions.length} appSessions`);
-
-        await Promise.all(
-          appSessions.map((appSession) => migrateAppSession(appSession)),
-        );
-
-        return last.id;
-      });
-
-      if (!cursor) {
-        break;
-      }
-    }
-
-    console.log("Migration complete");
-  },
-);
diff --git a/packages/core/src/functions/migrations/kvChatsToPrisma.schema.ts b/packages/core/src/functions/migrations/kvChatsToPrisma.schema.ts
deleted file mode 100644
index afe8d582d..000000000
--- a/packages/core/src/functions/migrations/kvChatsToPrisma.schema.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { z } from "zod";
-
-export const kvChatsToPrismaSchema = {
-  data: z.object({
-    dryRun: z.boolean().default(true),
-  }),
-};
diff --git a/packages/core/src/functions/migrations/kvChatsToPrisma.ts b/packages/core/src/functions/migrations/kvChatsToPrisma.ts
deleted file mode 100644
index 7861ad6d8..000000000
--- a/packages/core/src/functions/migrations/kvChatsToPrisma.ts
+++ /dev/null
@@ -1,153 +0,0 @@
-import { clerkClient } from "@clerk/nextjs/server";
-import { prisma } from "@oakai/db";
-import { kv } from "@vercel/kv";
-import { z } from "zod";
-
-import { LessonPlanSchemaWhilstStreaming } from "../../../../aila/src/protocol/schema";
-import { inngest } from "../../inngest";
-import { kvChatsToPrismaSchema } from "./kvChatsToPrisma.schema";
-
-const chatSchema = z
-  .object({
-    id: z.string(),
-    path: z.string(),
-    title: z.string(),
-    userId: z.string(),
-    lessonPlan: LessonPlanSchemaWhilstStreaming,
-    sharePath: z.string().optional(),
-    createdAt: z.union([z.date(), z.number()]),
-    messages: z.array(
-      z
-        .object({
-          id: z.string().optional(),
-          content: z.string(),
-          role: z.union([
-            z.literal("function"),
-            z.literal("data"),
-            z.literal("user"),
-            z.literal("system"),
-            z.literal("assistant"),
-            z.literal("tool"),
-          ]),
-        })
-        .passthrough(),
-    ),
-  })
-  .passthrough();
-
-export const kvChatsToPrisma = inngest.createFunction(
-  {
-    name: "Migrate chats in kv to prisma AppSessions",
-    id: "kv-chats-to-prisma",
-  },
-  { event: "app/migrations.kvChatsToPrisma" },
-  async ({ event, step }) => {
-    const args = kvChatsToPrismaSchema.data.parse(event.data);
-    const DRY_RUN = args.dryRun;
-
-    if (DRY_RUN) {
-      console.log("Running in dry run mode");
-    }
-
-    const limit = 50;
-    let offset: number | null = 0;
-
-    while (offset !== null) {
-      offset = await step.run("Move KV chats to Prisma", async () => {
-        if (offset === null) {
-          return null;
-        }
-
-        const clerkResponse = await clerkClient.users.getUserList({
-          limit,
-          offset,
-        });
-
-        const users = clerkResponse.data;
-        console.log(`Found ${users.length} users`);
-
-        if (users.length === 0) {
-          return null;
-        }
-
-        for (const user of users) {
-          console.log(user.id, "- Migrating chats");
-
-          const chatIds: string[] = await kv.zrange(
-            `user:chat:${user.id}`,
-            0,
-            -1,
-          );
-
-          if (chatIds.length === 0) {
-            console.log(user.id, "- No chats to migrate for user");
-            continue;
-          }
-
-          const pipeline = kv.pipeline();
-
-          for (const chat of chatIds) {
-            pipeline.hgetall(chat);
-          }
-
-          const results: {
-            id: string;
-            userId: string;
-          }[] = await pipeline.exec();
-
-          for (const chat of results) {
-            if (!chat) {
-              continue;
-            }
-
-            const appSession = await prisma.appSession.findUnique({
-              where: {
-                id: chat.id,
-              },
-            });
-
-            if (appSession) {
-              console.log(chat.id, "- AppSession exists in prisma");
-              console.log(chat.id, "- Deleting chat from KV");
-              if (!DRY_RUN) {
-                await kv.zrem(`user:chat:${user.id}`, `chat:${chat.id}`);
-                await kv.del(chat.id);
-              }
-              continue;
-            }
-
-            const parseResult = chatSchema.safeParse(chat);
-            if (parseResult.success === false) {
-              console.log(
-                chat.id,
-                "- Chat schema validation failed. Skipping import",
-                parseResult.error.issues,
-              );
-              continue;
-            }
-
-            console.log(chat.id, "- Creating AppSession for chat");
-            if (!DRY_RUN) {
-              await prisma.appSession.create({
-                data: {
-                  id: chat.id,
-                  userId: chat.userId,
-                  appId: "lesson-planner",
-                  output: chat,
-                },
-              });
-            }
-
-            console.log(chat.id, "- Deleting chat from KV");
-            if (!DRY_RUN) {
-              await kv.zrem(`user:chat:${user.id}`, `chat:${chat.id}`);
-              await kv.del(chat.id);
-            }
-          }
-        }
-
-        return offset + limit;
-      });
-    }
-  },
-);
diff --git a/packages/core/src/models/generations.ts b/packages/core/src/models/generations.ts
index c256a015f..6c0770d57 100644
--- a/packages/core/src/models/generations.ts
+++ b/packages/core/src/models/generations.ts
@@ -2,10 +2,9 @@ import type {
   Generation,
   ModerationType,
   Prisma,
-  PrismaClientWithAccelerate} from "@oakai/db";
-import {
-  GenerationStatus
+  PrismaClientWithAccelerate,
 } from "@oakai/db";
+import { GenerationStatus } from "@oakai/db";
 import type { StructuredLogger } from "@oakai/logger";
 import { structuredLogger } from "@oakai/logger";
 import type { Logger as InngestLogger } from "inngest/middleware/logger";
@@ -13,7 +12,7 @@ import { omit } from "remeda";
 import { Md5 } from "ts-md5";
 
 export type PromptInputs = {
-  [key: string]: unknown | undefined;
+  [key: string]: unknown;
   fact?: string;
   knowledge?: string;
   transcript?: string;
diff --git a/packages/core/src/models/prompts.ts b/packages/core/src/models/prompts.ts
index d7317c6fe..5542b27d5 100644
--- a/packages/core/src/models/prompts.ts
+++ b/packages/core/src/models/prompts.ts
@@ -3,7 +3,7 @@ import type { StructuredLogger } from "@oakai/logger";
 import { structuredLogger } from "@oakai/logger";
 import type { Logger as InngestLogger } from "inngest/middleware/logger";
 import { PromptTemplate } from "langchain/prompts";
-import type { BaseMessage} from "langchain/schema";
+import type { BaseMessage } from "langchain/schema";
 import { SystemMessage } from "langchain/schema";
 import untruncateJson from "untruncate-json";
 
@@ -196,7 +196,7 @@ export class LLMRefusalError extends Error {
 
   constructor(message: string, meta: Partial<CompletionMeta>) {
     super(message);
-    this.name = "LLMCompletionError";
+    this.name = "LLMRefusalError";
     this.completionMeta = meta;
   }
 }
diff --git a/packages/core/src/rag/index.ts b/packages/core/src/rag/index.ts
index ed115b234..d97ad0fe0 100644
--- a/packages/core/src/rag/index.ts
+++ b/packages/core/src/rag/index.ts
@@ -35,7 +35,7 @@ const log = aiLogger("rag");
 
 export class RAG {
   prisma: PrismaClientWithAccelerate;
-  private _chatMeta: OpenAICompletionWithLoggingOptions;
+  private readonly _chatMeta: OpenAICompletionWithLoggingOptions;
   constructor(
     prisma: PrismaClientWithAccelerate,
     chatMeta: OpenAICompletionWithLoggingOptions,
@@ -776,7 +776,7 @@ Thank you and happy classifying!`;
       topN: k,
     });
     const mostRelevantHydrated = rerank.results
-      .sort((a, b) => b.relevanceScore - a.relevanceScore)
+      .toSorted((a, b) => b.relevanceScore - a.relevanceScore)
       .map((r) => {
         const lessonPlan = lessonPlans[r.index];
         if (!lessonPlan) {
diff --git a/packages/db/scripts/import-export/validate_data.ts b/packages/db/scripts/import-export/validate_data.ts
index c653559d8..59e609910 100644
--- a/packages/db/scripts/import-export/validate_data.ts
+++ b/packages/db/scripts/import-export/validate_data.ts
@@ -108,8 +108,7 @@ const validateCSV = (
           }
         });
 
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        for (const [fk, refTable] of Object.entries(foreignKeys)) {
+        for (const fk of Object.keys(foreignKeys)) {
           if (!foreignKeyCheck[fk]) {
             foreignKeyCheck[fk] = new Set();
           }
diff --git a/packages/exports/src/gSuite/docs/findMarkdownImages.ts b/packages/exports/src/gSuite/docs/findMarkdownImages.ts
new file mode 100644
index 000000000..34b09977c
--- /dev/null
+++ b/packages/exports/src/gSuite/docs/findMarkdownImages.ts
@@ -0,0 +1,70 @@
+import type { docs_v1 } from "@googleapis/docs";
+
+export async function findMarkdownImages(
+  googleDocs: docs_v1.Docs,
+  documentId: string,
+): Promise<{ url: string; altText: string; startIndex: number }[]> {
+  const doc = await googleDocs.documents.get({ documentId });
+  const body = doc.data.body?.content;
+
+  if (!body) return [];
+
+  const markdownImageRegex = /!\[(.*?)\]\((.*?)\)/g;
+  const matches: { url: string; altText: string; startIndex: number }[] = [];
+
+  function handleMatch(
+    match: RegExpExecArray,
+    textElement: docs_v1.Schema$ParagraphElement,
+  ): void {
+    const [, altText, url] = match;
+    const textElementStartIndex = textElement.startIndex;
+    const matchIndex = match.index;
+    if (
+      typeof textElementStartIndex !== "number" ||
+      typeof matchIndex !== "number"
+    ) {
+      return;
+    }
+    const startIndex = textElementStartIndex + matchIndex;
+    if (url && typeof altText === "string") {
+      matches.push({ url, altText, startIndex });
+    }
+  }
+
+  function processTextElements(elements: docs_v1.Schema$ParagraphElement[]) {
+    for (const textElement of elements) {
+      const textContent = textElement.textRun?.content ?? "";
+      let match: RegExpExecArray | null;
+      while ((match = markdownImageRegex.exec(textContent)) !== null) {
+        handleMatch(match, textElement);
+      }
+    }
+  }
+
+  function processTableCells(cells: docs_v1.Schema$TableCell[]) {
+    for (const cell of cells) {
+      for (const cellElement of cell.content ?? []) {
+        if (cellElement.paragraph?.elements) {
+          processTextElements(cellElement.paragraph.elements);
+        }
+      }
+    }
+  }
+
+  function processBodyElements(elements: docs_v1.Schema$StructuralElement[]) {
+    for (const element of elements) {
+      if (element.table) {
+        for (const row of element.table.tableRows ?? []) {
+          processTableCells(row.tableCells ?? []);
+        }
+      }
+      if (element.paragraph?.elements) {
+        processTextElements(element.paragraph.elements);
+      }
+    }
+  }
+
+  processBodyElements(body);
+
+  return matches;
+}
diff --git a/packages/exports/src/gSuite/docs/imageReplacements.ts b/packages/exports/src/gSuite/docs/imageReplacements.ts
new file mode 100644
index 000000000..49cdae924
--- /dev/null
+++ b/packages/exports/src/gSuite/docs/imageReplacements.ts
@@ -0,0 +1,62 @@
+import type { docs_v1 } from "@googleapis/docs";
+import { aiLogger } from "@oakai/logger";
+
+const log = aiLogger("exports");
+
+export function imageReplacements(
+  markdownImages: { url: string; altText: string; startIndex: number }[],
+): { requests: docs_v1.Schema$Request[] } {
+  if (markdownImages.length === 0) {
+    log.info("No Markdown images to process.");
+    return { requests: [] };
+  }
+
+  let cumulativeShift = 0; // Tracks the total index shift from previous operations
+
+  const requests: docs_v1.Schema$Request[] = [];
+
+  markdownImages.forEach((image) => {
+    // Construct the full Markdown reference
+    const markdownImageReference = `![${image.altText}](${image.url})`;
+
+    const markdownLength = markdownImageReference.length;
+
+    // Adjust the start and end index dynamically based on the cumulative shift
+    const adjustedStartIndex = image.startIndex + cumulativeShift;
+    const adjustedEndIndex = adjustedStartIndex + markdownLength;
+
+    // Request to delete the exact range of the Markdown reference
+    requests.push({
+      deleteContentRange: {
+        range: {
+          startIndex: adjustedStartIndex,
+          endIndex: adjustedEndIndex,
+        },
+      },
+    });
+
+    // Request to insert the inline image at the adjusted startIndex
+    requests.push({
+      insertInlineImage: {
+        uri: image.url,
+        location: {
+          index: adjustedStartIndex, // Insert at the same startIndex where the Markdown was removed
+        },
+        objectSize: {
+          height: {
+            magnitude: 150,
+            unit: "PT",
+          },
+          width: {
+            magnitude: 150,
+            unit: "PT",
+          },
+        },
+      },
+    });
+    const netShift = 1 - markdownLength; // Inline image adds 1, Markdown removes its length
+    cumulativeShift += netShift;
+  });
+
+  return { requests };
+}
diff --git a/packages/exports/src/gSuite/docs/populateDoc.ts b/packages/exports/src/gSuite/docs/populateDoc.ts
index 2af3b893d..3f27edc5d 100644
--- a/packages/exports/src/gSuite/docs/populateDoc.ts
+++ b/packages/exports/src/gSuite/docs/populateDoc.ts
@@ -1,11 +1,17 @@
 import type { docs_v1 } from "@googleapis/docs";
+import { aiLogger } from "@oakai/logger";
 
 import type { Result } from "../../types";
-import type { ValueToString} from "../../utils";
+import type { ValueToString } from "../../utils";
 import { defaultValueToString } from "../../utils";
+import { findMarkdownImages } from "./findMarkdownImages";
+import { imageReplacements } from "./imageReplacements";
+import { textReplacements } from "./textReplacements";
+
+const log = aiLogger("exports");
 
 /**
- * @description Populates the template document with the given data.
+ * Populates the template document with the given data, handling image replacements for all placeholders.
  */
 export async function populateDoc<
   Data extends Record<string, string | string[] | null | undefined>,
@@ -23,37 +29,43 @@ export async function populateDoc<
   valueToString?: ValueToString<Data>;
 }): Promise<Result<{ missingData: string[] }>> {
   try {
-    const requests: docs_v1.Schema$Request[] = [];
     const missingData: string[] = [];
 
-    Object.entries(data).forEach(([key, value]) => {
-      const valueStr = valueToString(key, value);
-      if (!valueStr.trim() && warnIfMissing.includes(key)) {
-        missingData.push(key);
-      }
-      requests.push({
-        replaceAllText: {
-          replaceText: valueStr,
-          containsText: {
-            text: `{{${key}}}`,
-            matchCase: false,
-          },
+    const { requests: textRequests } = textReplacements({
+      data,
+      warnIfMissing,
+      valueToString,
+    });
+
+    if (textRequests.length > 0) {
+      await googleDocs.documents.batchUpdate({
+        documentId,
+        requestBody: {
+          requests: textRequests,
         },
       });
-    });
+    }
+
+    const markdownImages = await findMarkdownImages(googleDocs, documentId);
+
+    const { requests: imageRequests } = imageReplacements(markdownImages);
+
+    if (imageRequests.length > 0) {
+      await googleDocs.documents.batchUpdate({
+        documentId,
+        requestBody: {
+          requests: imageRequests,
+        },
+      });
+    }
 
-    await googleDocs.documents.batchUpdate({
-      documentId,
-      requestBody: {
-        requests,
-      },
-    });
     return {
       data: {
         missingData,
       },
     };
   } catch (error) {
+    log.error("Failed to populate document:", error);
     return {
       error,
       message: "Failed to populate doc template",
diff --git a/packages/exports/src/gSuite/docs/textReplacements.ts b/packages/exports/src/gSuite/docs/textReplacements.ts
new file mode 100644
index 000000000..58d613071
--- /dev/null
+++ b/packages/exports/src/gSuite/docs/textReplacements.ts
@@ -0,0 +1,36 @@
+import type { docs_v1 } from "@googleapis/docs";
+
+import type { ValueToString } from "../../utils";
+
+export function textReplacements<
+  Data extends Record<string, string | string[] | null | undefined>,
+>({
+  data,
+  warnIfMissing,
+  valueToString,
+}: {
+  data: Data;
+  warnIfMissing: (keyof Data)[];
+  valueToString: ValueToString<Data>;
+}): { requests: docs_v1.Schema$Request[]; missingData: string[] } {
+  const requests: docs_v1.Schema$Request[] = [];
+  const missingData: string[] = [];
+
+  Object.entries(data).forEach(([key, value]) => {
+    const valueStr = valueToString(key, value);
+    if (!valueStr.trim() && warnIfMissing.includes(key)) {
+      missingData.push(key);
+    }
+    requests.push({
+      replaceAllText: {
+        replaceText: valueStr,
+        containsText: {
+          text: `{{${key}}}`,
+          matchCase: false,
+        },
+      },
+    });
+  });
+
+  return { requests, missingData };
+}
diff --git a/packages/exports/src/schema/input.schema.ts b/packages/exports/src/schema/input.schema.ts
index ce7be09c7..59870b427 100644
--- a/packages/exports/src/schema/input.schema.ts
+++ b/packages/exports/src/schema/input.schema.ts
@@ -54,6 +54,8 @@ export const lessonSlidesInputSchema = z.object({
   cycle2: cycleSchema.nullish(),
   cycle3: cycleSchema.nullish(),
   additionalMaterials: z.string().nullish(),
+  _experimental_starterQuizMathsV0: quizSchema.nullish(),
+  _experimental_exitQuizMathsV0: quizSchema.nullish(),
 });
 
 export type LessonSlidesInputData = z.infer<typeof lessonSlidesInputSchema>;
diff --git a/packages/logger/index.ts b/packages/logger/index.ts
index 555179d60..485269e70 100644
--- a/packages/logger/index.ts
+++ b/packages/logger/index.ts
@@ -31,6 +31,7 @@ type ChildKey =
   | "aila:rag"
   | "aila:testing"
   | "aila:chat"
+  | "aila:experimental-patches"
   | "analytics"
   | "app"
   | "auth"
@@ -52,6 +53,7 @@ type ChildKey =
   | "moderation"
   | "prompts"
   | "qd"
+  | "quiz"
   | "rag"
   | "rate-limiting"
   | "snippets"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c8afd0bf4..5284adebd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -136,7 +136,7 @@ importers:
         version: link:../../packages/prettier-config
       '@oaknational/oak-components':
         specifier: ^1.50.0
-        version: 1.50.0(next-cloudinary@5.20.0)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.11)
+        version: 1.51.0(next-cloudinary@5.20.0)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.11)
       '@oaknational/oak-consent-client':
         specifier: ^2.1.0
         version: 2.1.0(react-dom@18.2.0)(react@18.2.0)(zod@3.23.8)
@@ -5148,8 +5148,8 @@ packages:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
-  /@oaknational/oak-components@1.50.0(next-cloudinary@5.20.0)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.11):
-    resolution: {integrity: sha512-XYrpomFDV5A2VzrXNMQCYW9PFoCxSlDoEEeRw9rZ0ZUa1v5hiWEmZKcNoDOgqribtcYzb5CdwW6+Kze7IR5cPA==}
+  /@oaknational/oak-components@1.51.0(next-cloudinary@5.20.0)(next@14.2.18)(react-dom@18.2.0)(react@18.2.0)(styled-components@5.3.11):
+    resolution: {integrity: sha512-447ikR3goofAR/sS5oTVQ1UPoyyODOGidNnSCZyVG7O1HvyJeAKII1zaP9GmUgQ0JKonGisfYAgcxRbTvx/PmQ==}
     peerDependencies:
       next: ^14.2.12
       next-cloudinary: ^5.20.0