diff --git a/.env.local b/.env.local
deleted file mode 100644
index b102f4cd8..000000000
--- a/.env.local
+++ /dev/null
@@ -1,13 +0,0 @@
-ENV_FILE_NAME=LOCAL
-NEXT_PUBLIC_BASE_URL=https://localhost:4200
-PROVIDER_ANALYTICS_POSTGRES_URL="postgres://default:this0is0a0secret0password@localhost:5432/verceldb"
-PROVIDER_ANALYTICS_POSTGRES_PRISMA_URL="postgres://default:this0is0a0secret0password@localhost:5432/verceldb?pgbouncer=true&connect_timeout=15"
-PROVIDER_ANALYTICS_POSTGRES_URL_NON_POOLING="postgres://default:this0is0a0secret0password@localhost:5432/verceldb"
-PROVIDER_ANALYTICS_POSTGRES_USER="default"
-PROVIDER_ANALYTICS_POSTGRES_PASSWORD="this0is0a0secret0password"
-PROVIDER_ANALYTICS_POSTGRES_DATABASE="verceldb"
-PROVIDER_QUESTION_BANK_REDIS_UPSTASH_URL="http://localhost:8079"
-PROVIDER_QUESTION_BANK_REDIS_UPSTASH_TOKEN="this0is0a0secret0password"
-PROVIDER_GITHUB_TOKEN=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
-PROVIDER_GITHUB_PROJECT_OWNER=PupoSDC
-PROVIDER_GITHUB_PROJECT_NAME=chair-flight
diff --git a/.gitignore b/.gitignore
index ea64697ac..11c301427 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,8 +38,9 @@ Thumbs.db
 
 # Next.js
 .next
-.env*
+.env.*
 !.env.example
+
 *.tsbuildinfo
 .vercel
 
diff --git a/apps/docs/.storybook/preview.tsx b/apps/docs/.storybook/preview.tsx
index 79781b387..8d42bf4a8 100644
--- a/apps/docs/.storybook/preview.tsx
+++ b/apps/docs/.storybook/preview.tsx
@@ -7,19 +7,22 @@ import { Preview } from "@storybook/react";
 import { themes } from "@storybook/theming";
 import { initialize, mswDecorator, mswLoader } from "msw-storybook-addon";
 import { useDarkMode } from "storybook-dark-mode";
-import { trpc } from "@chair-flight/trpc/client";
 import { theme } from "@chair-flight/react/components";
+import { trpc } from "@chair-flight/trpc/client";
 import type { TypographyProps } from "@mui/joy";
 import "@fontsource/public-sans";
 
 initialize({
   onUnhandledRequest: ({ method, url }) => {
-    if (url.pathname.startsWith("/trpc")) {
+    if (url.pathname.includes("/trpc")) {
       console.error(`Unhandled ${method} request to ${url}.
 
-        This exception has been only logged in the console, however, it's strongly recommended to resolve this error as you don't want unmocked data in Storybook stories.
+        This exception has been only logged in the console, however, it's strongly 
+        recommended to resolve this error as you don't want unmocked data in 
+        Storybook stories.
 
-        If you wish to mock an error response, please refer to this guide: https://mswjs.io/docs/recipes/mocking-error-responses
+        If you wish to mock an error response, please refer to this guide: 
+        https://mswjs.io/docs/recipes/mocking-error-responses
       `);
     }
   },
@@ -90,11 +93,6 @@ const preview: Preview = {
         <Story />
       </Suspense>
     ),
-    mswDecorator,
-    (Story) => {
-      const Component = trpc.withTRPC(Story);
-      return <Component />;
-    },
     (Story) => (
       <CssVarsProvider theme={joyTheme}>
         <CssBaseline />
@@ -102,6 +100,11 @@ const preview: Preview = {
         <Story />
       </CssVarsProvider>
     ),
+    (Story) => {
+      const Component = trpc.withTRPC(Story);
+      return <Component />;
+    },
+    mswDecorator,
   ],
 };
 
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-question-body.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-question-body.tsx
deleted file mode 100644
index 73230f4a8..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-question-body.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useState } from "react";
-import { Controller, useFormContext } from "react-hook-form";
-import { Box, FormControl, FormLabel, Select, Option, Button } from "@mui/joy";
-import { getNewVariant } from "@chair-flight/core/app";
-import { HookFormTextArea } from "@chair-flight/react/components";
-import { useFormHistory } from "@chair-flight/react/containers";
-import { InputAutocompleteLearningObjectives } from "./input-autocomplete-learning-objectives";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-import type { QuestionVariantType } from "@chair-flight/base/types";
-import type { FunctionComponent } from "react";
-
-export const EditQuestionBody: FunctionComponent = () => {
-  const form = useFormContext<EditQuestionFormValues>();
-  const history = useFormHistory(form.watch("question.id"));
-
-  const [newVariantType, setNewVariantType] =
-    useState<QuestionVariantType>("simple");
-
-  const addNewVariant = () => {
-    const newVariant = getNewVariant(newVariantType);
-    form.setValue(`question.variants.${newVariant.id}`, newVariant);
-    history.save();
-  };
-
-  return (
-    <Box sx={{ p: 1 }} onBlur={() => history.save()}>
-      <FormControl>
-        <FormLabel>Learning Objectives</FormLabel>
-        <Controller
-          control={form.control}
-          name="question.learningObjectives"
-          render={({ field }) => (
-            <InputAutocompleteLearningObjectives {...field} />
-          )}
-        />
-      </FormControl>
-      <HookFormTextArea
-        {...form.register("question.explanation")}
-        minRows={5}
-        sx={{ mt: 1 }}
-      />
-      <FormControl sx={{ mt: 1 }}>
-        <FormLabel>Create New Variant</FormLabel>
-        <Select
-          value={newVariantType}
-          onChange={(_, v) => v && setNewVariantType(v)}
-        >
-          <Option value="simple">Simple</Option>
-          <Option value="one-two">OneTwo</Option>
-          <Option disabled value="calculation">
-            Calculation
-          </Option>
-        </Select>
-      </FormControl>
-      <Button
-        fullWidth
-        sx={{ mt: 1 }}
-        onClick={() => addNewVariant()}
-        children="Create new Variant"
-      />
-    </Box>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-question-header.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-question-header.tsx
deleted file mode 100644
index 549682bdf..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-question-header.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { useState } from "react";
-import { set, useFormContext } from "react-hook-form";
-import { default as router } from "next/router";
-import { NoSsr } from "@mui/base";
-import { default as EditIcon } from "@mui/icons-material/Edit";
-import { default as GitHubIcon } from "@mui/icons-material/GitHub";
-import { default as RestartAltIcon } from "@mui/icons-material/RestartAlt";
-import { default as UndoIcon } from "@mui/icons-material/Undo";
-import { Badge, Box, Button, IconButton, Tooltip, Typography } from "@mui/joy";
-import { AppLayout, toast } from "@chair-flight/react/components";
-import { useFormHistory } from "@chair-flight/react/containers";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-
-export const EditQuestionHeader = () => {
-  const form = useFormContext<EditQuestionFormValues>();
-  const questionId = form.watch("question.id");
-  const { undo, isUndoAvailable, historyLength } = useFormHistory(questionId);
-  const [isValidated, setIsValidated] = useState(false);
-
-  const validate = async () => {
-    const isValid = await form.trigger("question");
-    if (isValid) {
-      toast.success("Validation successful! 🎉");
-      setIsValidated(true);
-    } else {
-      toast.error("Validation failed! 😢");
-      setIsValidated(false);
-    }
-    return isValid;
-  };
-
-  const navigateToValidation = async () => {
-    const isValid = await form.trigger("question");
-    if (isValid) {
-      setIsValidated(true);
-      set;
-      router.push(`/questions/${questionId}/edit?modal=review`, undefined, {
-        shallow: true,
-      });
-    } else {
-      toast.error("Validation failed! 😢");
-    }
-  };
-
-  //useEffect(() => {
-  //  setIsValidated(false);
-  //}, [form.formState.isDirty]);
-
-  return (
-    <AppLayout.Header>
-      <Box sx={{ display: "flex", alignItems: "baseline" }}>
-        <EditIcon sx={{ mx: 1 }} fontSize="xl2" />
-        <Typography level="h4">{`Editing Question ${questionId}`}</Typography>
-      </Box>
-      <Box
-        sx={{
-          display: "flex",
-          alignItems: "center",
-          "& button": { mr: 1 },
-        }}
-      >
-        <NoSsr>
-          <Tooltip title="undo" variant="soft">
-            <IconButton
-              disabled={!isUndoAvailable}
-              color={"primary"}
-              variant="plain"
-              onClick={() => undo()}
-            >
-              <Badge
-                badgeContent={historyLength - 1}
-                size="sm"
-                variant="soft"
-                max={99}
-              >
-                <UndoIcon />
-              </Badge>
-            </IconButton>
-          </Tooltip>
-          <Tooltip title="re-validate" variant="soft">
-            <IconButton
-              color={"primary"}
-              variant="plain"
-              onClick={() => validate()}
-              children={<RestartAltIcon />}
-            />
-          </Tooltip>
-          <Button
-            sx={{ ml: "auto" }}
-            color={isValidated ? "success" : "neutral"}
-            onClick={() => navigateToValidation()}
-            endDecorator={<GitHubIcon />}
-            children={"Create a Pull Request"}
-          />
-        </NoSsr>
-      </Box>
-    </AppLayout.Header>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-as-code.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-as-code.tsx
deleted file mode 100644
index 3507b1a7a..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-as-code.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { startTransition, useState } from "react";
-import { useFormContext } from "react-hook-form";
-import { default as dynamic } from "next/dynamic";
-import { useRouter } from "next/router";
-import { Sheet, Typography, useColorScheme } from "@mui/joy";
-import { questionVariantSchema } from "@chair-flight/core/schemas";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-import type { ChangeEvent, FunctionComponent } from "react";
-
-const CodeEditor = dynamic(
-  () => import("@uiw/react-textarea-code-editor").then((mod) => mod.default),
-  { ssr: false },
-);
-
-export const EditVariantModalAsCode: FunctionComponent = () => {
-  const form = useFormContext<EditQuestionFormValues>();
-  const router = useRouter();
-  const variantId = router.query["variantId"] as string;
-  const { mode } = useColorScheme();
-  const [error, setError] = useState("");
-  const [code, setCode] = useState(() =>
-    JSON.stringify(form.watch(`question.variants.${variantId}`), null, 2),
-  );
-
-  const onCodeChanged = (evt: ChangeEvent<HTMLTextAreaElement>) => {
-    const code = evt.target.value;
-    setCode(evt.target.value);
-    startTransition(() => {
-      try {
-        const value = questionVariantSchema.parse(JSON.parse(code));
-        form.setValue(`question.variants.${variantId}`, value);
-        setError("");
-      } catch (error) {
-        setError((error as Error).message);
-      }
-    });
-  };
-
-  return (
-    <Sheet variant="outlined" color={error ? "danger" : "neutral"}>
-      <CodeEditor
-        value={code}
-        language="js"
-        data-color-mode={mode === "dark" ? "dark" : "light"}
-        placeholder="Please enter JS code."
-        onChange={onCodeChanged}
-        padding={16}
-        style={{
-          fontSize: 12,
-          borderRadius: 8,
-          fontFamily:
-            "ui-monospace,SFMono-Regular,SF Mono,Consolas,Liberation Mono,Menlo,monospace",
-        }}
-      />
-      {error && (
-        <Typography level="body2" sx={{ mt: 0.5, ml: 2 }} color="danger">
-          {error}
-        </Typography>
-      )}
-    </Sheet>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-one-two.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-one-two.tsx
deleted file mode 100644
index 34f3dec3b..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-one-two.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { get, useFormContext } from "react-hook-form";
-import { useRouter } from "next/router";
-import { default as CreateIcon } from "@mui/icons-material/Add";
-import { default as CloseIcon } from "@mui/icons-material/Close";
-import { Box, FormLabel, IconButton, Sheet } from "@mui/joy";
-import { HookFormTextArea } from "@chair-flight/react/components";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-import type { FunctionComponent } from "react";
-
-type Statements =
-  | "firstCorrectStatements"
-  | "firstIncorrectStatements"
-  | "secondCorrectStatements"
-  | "secondIncorrectStatements";
-
-const statementTypes: Statements[] = [
-  "firstCorrectStatements",
-  "firstIncorrectStatements",
-  "secondCorrectStatements",
-  "secondIncorrectStatements",
-];
-
-export const EditVariantModalOneTwo: FunctionComponent = () => {
-  const router = useRouter();
-  const form = useFormContext<EditQuestionFormValues>();
-  const variantId = router.query["variantId"] as string;
-
-  return (
-    <>
-      <HookFormTextArea
-        {...form.register(`question.variants.${variantId}.question`)}
-        formLabel={"Question"}
-        minRows={1}
-      />
-      {statementTypes.map((statementType) => {
-        const statements = form.watch(
-          `question.variants.${variantId}.${statementType}`,
-        );
-        const error = get(
-          form.formState.errors,
-          `variants.${variantId}.${statementType}`,
-        );
-
-        return (
-          <Sheet
-            key={statementType}
-            sx={{ p: 1, my: 1 }}
-            variant="outlined"
-            color={error ? "danger" : "neutral"}
-          >
-            <Box sx={{ display: "flex", justifyContent: "space-between" }}>
-              <FormLabel sx={{ mt: 1 }}>
-                {statementType
-                  .split(/(?=[A-Z])/)
-                  .map((n) => n.charAt(0).toUpperCase() + n.slice(1))
-                  .join(" ")}
-              </FormLabel>
-              <IconButton
-                variant="plain"
-                color="success"
-                children={<CreateIcon />}
-                onClick={() => {
-                  const length = statements.length;
-                  form.setValue(
-                    `question.variants.${variantId}.${statementType}.${length}`,
-                    "",
-                  );
-                  form.clearErrors(
-                    `question.variants.${variantId}.${statementType}`,
-                  );
-                }}
-              />
-            </Box>
-            {statements.map((_, index) => {
-              return (
-                <Box
-                  key={index}
-                  sx={{ my: 1, display: "flex", justifyContent: "flex-start" }}
-                >
-                  <HookFormTextArea
-                    {...form.register(
-                      `question.variants.${variantId}.${statementType}.${index}`,
-                    )}
-                    formLabel={"Question"}
-                    minRows={1}
-                  />
-                  <IconButton
-                    variant="plain"
-                    color="danger"
-                    children={<CloseIcon />}
-                    onClick={() =>
-                      form.setValue(
-                        `question.variants.${variantId}.${statementType}`,
-                        statements.filter((_, i) => i !== index),
-                      )
-                    }
-                  />
-                </Box>
-              );
-            })}
-          </Sheet>
-        );
-      })}
-    </>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-simple.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-simple.tsx
deleted file mode 100644
index 17dfed261..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal-simple.tsx
+++ /dev/null
@@ -1,114 +0,0 @@
-import { useId, useState } from "react";
-import { Controller, get, useFormContext } from "react-hook-form";
-import { useRouter } from "next/router";
-import { default as AddIcon } from "@mui/icons-material/Add";
-import { default as CloseIcon } from "@mui/icons-material/Close";
-import { Box, FormLabel, IconButton, Sheet, Switch } from "@mui/joy";
-import { getRandomIdGenerator } from "@chair-flight/core/app";
-import {
-  HookFormErrorMessage,
-  HookFormTextArea,
-} from "@chair-flight/react/components";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-import type { FunctionComponent } from "react";
-import type { ZodError } from "zod";
-
-export const EditVariantModalSimple: FunctionComponent = () => {
-  const router = useRouter();
-  const form = useFormContext<EditQuestionFormValues>();
-  const randomSeed = useId();
-  const [getRandomId] = useState(() => getRandomIdGenerator(randomSeed));
-  const variantId = router.query["variantId"] as string;
-  const options = form.watch(`question.variants.${variantId}.options`);
-  const optionsError = get(
-    form.formState.errors,
-    `variants.${variantId}.options`,
-  ) as ZodError;
-
-  const createOption = () => {
-    const id = getRandomId();
-    form.setValue(`question.variants.${variantId}.options.${options.length}`, {
-      id: id,
-      text: "",
-      correct: false,
-      why: "",
-    });
-  };
-
-  const deleteOption = (id: string) => {
-    form.setValue(
-      `question.variants.${variantId}.options`,
-      options.filter((opt) => id !== opt.id),
-    );
-  };
-
-  return (
-    <>
-      <HookFormTextArea
-        {...form.register(`question.variants.${variantId}.question`)}
-        formLabel={"Question"}
-        minRows={1}
-      />
-      <FormLabel sx={{ mt: 1 }}>
-        Options
-        <IconButton
-          sx={{ ml: "auto" }}
-          variant="plain"
-          color="success"
-          onClick={createOption}
-          children={<AddIcon />}
-        />
-      </FormLabel>
-      {options.map((option, index) => {
-        const optionPath =
-          `question.variants.${variantId}.options.${index}` as const;
-
-        return (
-          <Sheet
-            key={option.id}
-            sx={{ p: 1, my: 1 }}
-            variant="outlined"
-            color={optionsError ? "danger" : "neutral"}
-          >
-            <Box sx={{ display: "flex", justifyContent: "space-between" }}>
-              <Controller
-                name={`${optionPath}.correct`}
-                control={form.control}
-                render={({ field }) => (
-                  <Switch
-                    {...field}
-                    checked={field.value}
-                    sx={{ width: "100%" }}
-                    color={field.value ? "success" : "danger"}
-                    endDecorator={field.value ? "Correct" : "Wrong"}
-                  />
-                )}
-              />
-              <Box sx={{ flex: 1 }} />
-              <IconButton
-                variant="plain"
-                color="danger"
-                onClick={() => deleteOption(option.id)}
-                children={<CloseIcon />}
-              />
-            </Box>
-            <HookFormTextArea
-              {...form.register(`${optionPath}.text`)}
-              placeholder="Write an option here"
-              minRows={1}
-              sx={{ mt: 1 }}
-            />
-            <HookFormTextArea
-              {...form.register(`${optionPath}.why`)}
-              placeholder="Use This to briefly justify this option"
-              formLabel="Why"
-              minRows={1}
-              sx={{ mt: 1 }}
-            />
-            <HookFormErrorMessage name={`${optionPath}`} />
-          </Sheet>
-        );
-      })}
-    </>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal.tsx
deleted file mode 100644
index 6bb1c3aa6..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-variant-modal.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import { useState, type FunctionComponent, useEffect } from "react";
-import { Controller, useFormContext } from "react-hook-form";
-import { useRouter } from "next/router";
-import { default as CloseIcon } from "@mui/icons-material/Close";
-import { default as CodeIcon } from "@mui/icons-material/Code";
-import { default as CodeOffIcon } from "@mui/icons-material/CodeOff";
-import { default as RestartAltIcon } from "@mui/icons-material/RestartAlt";
-import { default as UndoIcon } from "@mui/icons-material/Undo";
-import { Badge, IconButton, Modal, Tooltip, Typography } from "@mui/joy";
-import { Box, FormControl, FormLabel, ModalDialog, Grid } from "@mui/joy";
-import { getVariantPreview } from "@chair-flight/core/app";
-import { toast } from "@chair-flight/react/components";
-import { AppLayout, MarkdownClient } from "@chair-flight/react/components";
-import { useFormHistory } from "@chair-flight/react/containers";
-import { EditVariantModalAsCode } from "./edit-variant-modal-as-code";
-import { EditVariantModalOneTwo } from "./edit-variant-modal-one-two";
-import { EditVariantModalSimple } from "./edit-variant-modal-simple";
-import { InputCommaSeparatedValues } from "./input-comma-seperated-values";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-
-export const EditVariantModal: FunctionComponent = () => {
-  const [codeEditor, setCodeEditor] = useState(false);
-  const router = useRouter();
-  const form = useFormContext<EditQuestionFormValues>();
-  const questionId = router.query["questionId"] as string;
-  const variantId = router.query["variantId"] as string;
-  const name = `question.variants.${router.query["variantId"]}` as const;
-  const variant = form.watch(name);
-  const history = useFormHistory(name);
-  const { clear, save } = history;
-
-  const variantSpecificFormSnippet = {
-    "one-two": <EditVariantModalOneTwo />,
-    simple: <EditVariantModalSimple />,
-    calculation: <div>Not Implemented!</div>,
-  }[variant?.type ?? "one-two"];
-
-  const closeModal = () => {
-    router.push(`/questions/${questionId}/edit`, undefined, { shallow: true });
-  };
-
-  const validate = async () => {
-    const isValid = await form.trigger(`question.variants.${variantId}`);
-    if (isValid) {
-      toast.success("Validation successful! 🎉");
-    } else {
-      toast.error("Validation failed! 😢");
-    }
-  };
-
-  useEffect(() => {
-    clear();
-    save();
-    return () => clear();
-  }, [clear, save]);
-
-  return (
-    <Modal open={!!variant}>
-      <ModalDialog layout="fullscreen">
-        {variant && (
-          <>
-            <AppLayout.Header>
-              <Typography>Edit Variant</Typography>
-              <Box sx={{ display: "flex" }}>
-                <Tooltip title="undo" variant="soft">
-                  <IconButton
-                    color={"primary"}
-                    variant="plain"
-                    onClick={() => setCodeEditor((v) => !v)}
-                  >
-                    {codeEditor ? <CodeOffIcon /> : <CodeIcon />}
-                  </IconButton>
-                </Tooltip>
-                <Tooltip title="undo" variant="soft">
-                  <IconButton
-                    disabled={!history.isUndoAvailable}
-                    color={"primary"}
-                    variant="plain"
-                    onClick={() => history.undo()}
-                  >
-                    <Badge
-                      badgeContent={history.historyLength - 1}
-                      size="sm"
-                      variant="soft"
-                      max={99}
-                    >
-                      <UndoIcon />
-                    </Badge>
-                  </IconButton>
-                </Tooltip>
-                <Tooltip title="re-validate" variant="soft">
-                  <IconButton
-                    color={"primary"}
-                    variant="plain"
-                    onClick={() => validate()}
-                  >
-                    <RestartAltIcon />
-                  </IconButton>
-                </Tooltip>
-                <IconButton
-                  color="primary"
-                  variant="plain"
-                  children={<CloseIcon />}
-                  onClick={closeModal}
-                  sx={{ mr: 2 }}
-                />
-              </Box>
-            </AppLayout.Header>
-            <Grid
-              container
-              spacing={2}
-              sx={{ height: "100%", overflow: "hidden" }}
-              onBlur={() => save()}
-            >
-              <Grid xs={8} sx={{ overflow: "scroll", height: "100%", pr: 2 }}>
-                {codeEditor ? (
-                  <EditVariantModalAsCode />
-                ) : (
-                  <>
-                    {variantSpecificFormSnippet}
-                    <FormControl sx={{ mt: 1 }}>
-                      <FormLabel>Annexes</FormLabel>
-                      <Controller
-                        control={form.control}
-                        name={`question.variants.${variantId}.annexes`}
-                        render={({ field: { onChange, onBlur, value } }) => (
-                          <InputCommaSeparatedValues
-                            onChange={onChange}
-                            onBlur={onBlur}
-                            value={value}
-                          />
-                        )}
-                      />
-                    </FormControl>
-                    <FormControl sx={{ mt: 1 }}>
-                      <FormLabel>External Ids</FormLabel>
-                      <Controller
-                        control={form.control}
-                        name={`question.variants.${variantId}.externalIds`}
-                        render={({ field: { onChange, onBlur, value } }) => (
-                          <InputCommaSeparatedValues
-                            onChange={onChange}
-                            onBlur={onBlur}
-                            value={value}
-                          />
-                        )}
-                      />
-                    </FormControl>
-                  </>
-                )}
-              </Grid>
-              <Grid md={4}>
-                <MarkdownClient>{getVariantPreview(variant)}</MarkdownClient>
-              </Grid>
-            </Grid>
-          </>
-        )}
-      </ModalDialog>
-    </Modal>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/edit-variants.tsx b/apps/next-app/pages/questions/[questionId]/components/edit-variants.tsx
deleted file mode 100644
index 0a3d05cb5..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/edit-variants.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import { memo, useCallback, useRef } from "react";
-import Draggable from "react-draggable";
-import { get, useFormContext } from "react-hook-form";
-import { useRouter } from "next/router";
-import { Box, Button, FormLabel, styled } from "@mui/joy";
-import { toast } from "sonner";
-import { getVariantPreview } from "@chair-flight/core/app";
-import {
-  HookFormErrorMessage,
-  QuestionVariantPreview,
-} from "@chair-flight/react/components";
-import { useFormHistory } from "@chair-flight/react/containers";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-import type { QuestionVariant } from "@chair-flight/base/types";
-import type { FunctionComponent } from "react";
-
-const ListContainer = styled(Box)`
-  list-style: none;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-  overflow: scroll;
-  margin: 0;
-  padding: ${({ theme }) => theme.spacing(0, 2, 0, 0)};
-` as typeof Box;
-
-type DraggableVariantProps = {
-  error: boolean;
-  variant: QuestionVariant;
-  openVariant: (variantId: string) => void;
-  deleteVariant: (variantId: string) => void;
-  mergeVariants: (fromVariantId: string, toVariantId: string) => void;
-};
-
-const EditVariant = memo<DraggableVariantProps>(
-  ({ variant, error, openVariant, deleteVariant, mergeVariants }) => {
-    const ref = useRef<HTMLLinkElement>(null);
-    return (
-      <Draggable
-        nodeRef={ref}
-        key={variant.id}
-        position={{ x: 0, y: 0 }}
-        onStop={(_, data) => {
-          setTimeout(() => {
-            const target = data.node.parentNode
-              ?.querySelectorAll(":hover")?.[0]
-              ?.getAttribute("data-variant-id");
-            if (!target) return;
-            mergeVariants(variant.id, target);
-          }, 10);
-        }}
-      >
-        <Box
-          ref={ref}
-          component="li"
-          data-variant-id={variant.id}
-          sx={{
-            px: { xs: 0, md: 1 },
-            py: 1,
-            height: 400,
-            width: { xs: 1, lg: 1 / 2 },
-            "&.react-draggable-dragging": {
-              zIndex: 1000,
-            },
-            "&.react-draggable-dragging > *": {
-              zIndex: 1000,
-            },
-            "&:hover:not(.react-draggable-dragging)": {},
-          }}
-        >
-          <QuestionVariantPreview
-            id={variant.id}
-            error={error}
-            text={getVariantPreview(variant)}
-            learningObjectives={[]}
-            externalIds={variant.externalIds}
-            topRightCorner={
-              <>
-                <Button
-                  children="Edit"
-                  variant="plain"
-                  sx={{ mr: 1 }}
-                  onClick={() => openVariant(variant.id)}
-                />
-                <Button
-                  variant="plain"
-                  color="danger"
-                  onClick={() => deleteVariant(variant.id)}
-                  children="Delete"
-                />
-              </>
-            }
-            sx={{
-              flexDirection: "column",
-              alignItems: "flex-start",
-              textAlign: "left",
-              overflowY: "auto",
-            }}
-          />
-        </Box>
-      </Draggable>
-    );
-  },
-);
-
-EditVariant.displayName = "EditVariant";
-
-const deepCopy = <T,>(a: T): T => JSON.parse(JSON.stringify(a)) as T;
-
-export const EditVariants: FunctionComponent = () => {
-  const router = useRouter();
-  const form = useFormContext<EditQuestionFormValues>();
-  const questionId = router.query["questionId"] as string;
-  const variants = Object.values(form.watch("question.variants"));
-  const errors = form.formState.errors;
-  const { undo, save } = useFormHistory(questionId);
-  const { getValues, setValue } = form;
-
-  const mergeVariants = useCallback(
-    (fromId: string, toId: string) => {
-      if (fromId === toId) return;
-      const allVariants = getValues("question.variants");
-      const newAllVariants = deepCopy(allVariants);
-      const to = newAllVariants[toId];
-      const from = newAllVariants[fromId];
-      to.externalIds = [...new Set([...to.externalIds, ...from.externalIds])];
-      delete newAllVariants[fromId];
-      save();
-      setValue(`question.variants`, newAllVariants);
-      toast.success(`${fromId} merged into ${toId}`, {
-        duration: 8000,
-        action: { label: "Revert", onClick: undo },
-      });
-    },
-    [undo, save, setValue, getValues],
-  );
-
-  const deleteVariant = useCallback(
-    (variantId: string) => {
-      const { [variantId]: _, ...remainingValues } =
-        getValues("question.variants");
-      save();
-      setValue(`question.variants`, remainingValues);
-      toast.success(`${variantId} deleted`, {
-        duration: 8000,
-        action: { label: "Revert", onClick: undo },
-      });
-    },
-    [undo, save, setValue, getValues],
-  );
-
-  const openVariant = useCallback(
-    (variantId: string) => {
-      router.push(
-        `/questions/${questionId}/edit?variantId=${variantId}`,
-        undefined,
-        { shallow: true },
-      );
-    },
-    [questionId, router],
-  );
-
-  return (
-    <>
-      <FormLabel sx={{ ml: 1 }}>
-        {`Variants (${variants.length})`}
-        <HookFormErrorMessage name="variants" sx={{ mt: 0 }} />
-      </FormLabel>
-
-      <ListContainer component={"ul"}>
-        {variants.map((variant) => (
-          <EditVariant
-            error={!!get(errors, `question.variants.${variant.id}`)}
-            key={variant.id}
-            variant={variant}
-            openVariant={openVariant}
-            deleteVariant={deleteVariant}
-            mergeVariants={mergeVariants}
-          />
-        ))}
-      </ListContainer>
-    </>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/components/input-autocomplete-learning-objectives.tsx b/apps/next-app/pages/questions/[questionId]/components/input-autocomplete-learning-objectives.tsx
deleted file mode 100644
index 93c9ccee5..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/input-autocomplete-learning-objectives.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { forwardRef, useState } from "react";
-import { Autocomplete, AutocompleteOption, Typography } from "@mui/joy";
-import { trpc } from "@chair-flight/trpc/client";
-import type { LearningObjective } from "@chair-flight/base/types";
-
-export type InputAutocompleteLearningObjectivesProps = {
-  value: string[];
-  onChange: (value: string[]) => void;
-  onBlur?: () => void;
-};
-
-export const InputAutocompleteLearningObjectives = forwardRef<
-  HTMLDivElement,
-  InputAutocompleteLearningObjectivesProps
->(({ value, onChange, onBlur }) => {
-  const [search, setSearch] = useState("");
-
-  const { data, isLoading } = trpc.search.searchLearningObjectives.useQuery({
-    q: search,
-    limit: 10,
-    cursor: 0,
-  });
-
-  const optionsMap = (data?.items ?? []).reduce<
-    Record<string, LearningObjective>
-  >((acc, result) => {
-    acc[result.result.id] = result.result;
-    return acc;
-  }, {});
-
-  return (
-    <Autocomplete
-      multiple
-      freeSolo
-      forcePopupIcon
-      inputValue={search}
-      value={value}
-      loading={isLoading}
-      onBlur={onBlur}
-      onChange={(_, newValue) => onChange(newValue)}
-      onInputChange={(_, newInputValue) => setSearch(newInputValue)}
-      filterOptions={(options) => options}
-      placeholder="Learning Objectives"
-      options={data?.items.map((result) => result.result.id) ?? []}
-      sx={{
-        "& input": {
-          minWidth: "100%",
-        },
-        "& input:not(:first-child)": {
-          mt: 1,
-        },
-      }}
-      renderOption={(props, id) => {
-        return (
-          <AutocompleteOption {...props}>
-            <Typography level="body1">
-              <b> {optionsMap[id].id}</b>
-              <br />
-              {optionsMap[id].text}
-            </Typography>
-          </AutocompleteOption>
-        );
-      }}
-    />
-  );
-});
-
-InputAutocompleteLearningObjectives.displayName =
-  "InputAutocompleteLearningObjectives";
diff --git a/apps/next-app/pages/questions/[questionId]/components/input-comma-seperated-values.tsx b/apps/next-app/pages/questions/[questionId]/components/input-comma-seperated-values.tsx
deleted file mode 100644
index e0d44d76d..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/input-comma-seperated-values.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import { forwardRef, useEffect, useState } from "react";
-import { Chip, ChipDelete, Textarea, textareaClasses } from "@mui/joy";
-import type { TextareaProps } from "@mui/joy";
-
-export const InputCommaSeparatedValues = forwardRef<
-  HTMLDivElement,
-  Omit<
-    TextareaProps,
-    "value" | "onKeyPress" | "startDecorator" | "onKeyPress" | "onChange"
-  > & {
-    value?: string[];
-    onChange?: (value: string[]) => void;
-  }
->(({ value = [], onChange, ...props }, ref) => {
-  const [newValue, setNewValue] = useState<string>("");
-
-  const updateValue = (newValue: string) => {
-    if (newValue.match(/[, \t\n]/) && newValue.trim().length) {
-      setNewValue("");
-      onChange?.([...new Set([...value, newValue.trim()])]);
-    }
-  };
-
-  useEffect(() => updateValue(newValue));
-
-  return (
-    <Textarea
-      ref={ref}
-      sx={{
-        [`& .${textareaClasses.startDecorator}`]: {
-          flexWrap: "wrap",
-        },
-      }}
-      startDecorator={
-        value.length
-          ? value.map((v) => (
-              <Chip
-                key={v}
-                sx={{ m: 0.5 }}
-                color="primary"
-                variant="outlined"
-                children={v}
-                endDecorator={
-                  <ChipDelete
-                    color="primary"
-                    onDelete={() => {
-                      onChange?.(value.filter((x) => x !== v));
-                    }}
-                  />
-                }
-              />
-            ))
-          : undefined
-      }
-      value={newValue}
-      minRows={1}
-      onChange={(e) => {
-        setNewValue(e.target.value);
-      }}
-      onKeyDown={(e) => {
-        if (e.key === "Backspace" && !newValue.length) {
-          onChange?.(value.slice(0, -1));
-        }
-      }}
-      {...props}
-    />
-  );
-});
-
-InputCommaSeparatedValues.displayName = "InputCommaSeparatedValues";
diff --git a/apps/next-app/pages/questions/[questionId]/components/review-pr-modal.tsx b/apps/next-app/pages/questions/[questionId]/components/review-pr-modal.tsx
deleted file mode 100644
index c1afa036d..000000000
--- a/apps/next-app/pages/questions/[questionId]/components/review-pr-modal.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { useFormContext } from "react-hook-form";
-import { useRouter } from "next/router";
-import { default as GitHubIcon } from "@mui/icons-material/GitHub";
-import {
-  Box,
-  Button,
-  Link,
-  Modal,
-  ModalClose,
-  ModalDialog,
-  Typography,
-} from "@mui/joy";
-import {
-  HookFormInput,
-  HookFormTextArea,
-  toast,
-} from "@chair-flight/react/components";
-import { trpc } from "@chair-flight/trpc/client";
-import type { EditQuestionFormValues } from "../types/edit-question-form-values";
-import type { FunctionComponent } from "react";
-
-const useUpdateQuestion = trpc.questions.updateQuestion.useMutation;
-
-export const ReviewPrModal: FunctionComponent = () => {
-  const router = useRouter();
-  const form = useFormContext<EditQuestionFormValues>();
-  const isOpen = router.query["modal"] === "review";
-  const updateQuestion = useUpdateQuestion();
-
-  const navigateAwayFromModal = () => {
-    router.push(`/questions/${router.query["questionId"]}/edit`, undefined, {
-      shallow: true,
-    });
-  };
-
-  const onSubmit = form.handleSubmit(async (variables) => {
-    const questionId = variables.question.id;
-    toast.promise(updateQuestion.mutateAsync(variables), {
-      loading: "Submitting...",
-      error: "Failed to Submit 😔",
-      success: (response) => {
-        setTimeout(() => router.push(`/questions/${questionId}`), 3000);
-        return (
-          <Box>
-            <Typography
-              level="h5"
-              component="h4"
-              children={"Pull request is Submitted! 🎉🎉"}
-            />
-            <br />
-            <Link
-              href={response.url}
-              target="_blank"
-              children={"You can follow up on github!"}
-            />
-          </Box>
-        );
-      },
-    });
-  });
-
-  return (
-    <Modal open={isOpen} onClose={navigateAwayFromModal}>
-      <ModalDialog
-        component="form"
-        onSubmit={onSubmit}
-        sx={(theme) => ({
-          overflowY: "auto",
-          [theme.breakpoints.down("md")]: {
-            top: "unset",
-            bottom: 0,
-            left: 0,
-            right: 0,
-            borderRadius: 0,
-            transform: "none",
-            maxWidth: "unset",
-          },
-        })}
-      >
-        <ModalClose />
-        <div>
-          <Typography level="h4" component="h1">
-            <b>Open a Pull Request</b>
-          </Typography>
-          <Typography level="body2" sx={{ mt: 2 }}>
-            By completing the following steps you will open a Pull Request on
-            GitHub.
-            <br />
-            The Pull Request will be reviewed by a member of the Chair Flight
-            team and if approved, the changes will be merged into the
-            application and be available for all our users.
-            <br />
-            To make this process a bit easier please supply a short title and
-            description of the changes you made. You can optionally provide your
-            e-mail so that the changes are properly credited to yourself!
-          </Typography>
-        </div>
-        <div>
-          <HookFormInput
-            {...form.register("requestData.title")}
-            formLabel="Title"
-            placeholder="Title"
-            sx={{ mt: 2 }}
-          />
-          <HookFormTextArea
-            {...form.register("requestData.description")}
-            formLabel="Description"
-            placeholder="Description"
-            minRows={5}
-            maxRows={5}
-            sx={{ mt: 2 }}
-          />
-          <HookFormInput
-            {...form.register("requestData.authorName")}
-            optional
-            formLabel="Author's name / ID (Optional)"
-            placeholder="Author's name"
-            sx={{ mt: 2 }}
-          />
-          <HookFormInput
-            {...form.register("requestData.email")}
-            optional
-            formLabel="Email (Optional)"
-            placeholder="Email"
-            sx={{ mt: 2 }}
-          />
-          <Button
-            sx={{ mt: 2 }}
-            fullWidth
-            color="success"
-            disabled={!form.formState.isValid}
-            type="submit"
-            endDecorator={<GitHubIcon />}
-            children={"Create a Pull Request!"}
-          />
-        </div>
-      </ModalDialog>
-    </Modal>
-  );
-};
diff --git a/apps/next-app/pages/questions/[questionId]/edit.page.tsx b/apps/next-app/pages/questions/[questionId]/edit.page.tsx
index 810660217..d5af2a4af 100644
--- a/apps/next-app/pages/questions/[questionId]/edit.page.tsx
+++ b/apps/next-app/pages/questions/[questionId]/edit.page.tsx
@@ -1,8 +1,4 @@
-import { FormProvider, useForm } from "react-hook-form";
 import { useRouter } from "next/router";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { Grid } from "@mui/joy";
-import { questionEditSchema } from "@chair-flight/core/schemas";
 import {
   AppLayout,
   HEADER_HEIGHT,
@@ -11,41 +7,14 @@ import {
 import {
   AppHead,
   AppHeaderMenu,
-  RestoreFormHistory,
+  QuestionEditor,
 } from "@chair-flight/react/containers";
-import { trpc } from "@chair-flight/trpc/client";
 import { ssrHandler } from "@chair-flight/trpc/server";
-import { EditQuestionBody } from "./components/edit-question-body";
-import { EditQuestionHeader } from "./components/edit-question-header";
-import { EditVariantModal } from "./components/edit-variant-modal";
-import { EditVariants } from "./components/edit-variants";
-import { ReviewPrModal } from "./components/review-pr-modal";
-import type { EditQuestionFormValues } from "./types/edit-question-form-values";
 import type { NextPage } from "next";
 
-const resolver = zodResolver(questionEditSchema);
-
 export const EditQuestionPage: NextPage = () => {
   const router = useRouter();
   const questionId = router.query["questionId"] as string;
-
-  const [{ questionTemplate }] =
-    trpc.questions.getQuestionFromGithub.useSuspenseQuery({ questionId });
-
-  const defaultValues: EditQuestionFormValues = {
-    question: questionTemplate,
-    requestData: {
-      title: "",
-      description: "",
-    },
-  };
-
-  const form = useForm<EditQuestionFormValues>({
-    resolver,
-    defaultValues,
-    mode: "onBlur",
-  });
-
   return (
     <>
       <AppHead title={questionId} />
@@ -60,20 +29,7 @@ export const EditQuestionPage: NextPage = () => {
           },
         }}
       >
-        <FormProvider {...form}>
-          <EditQuestionHeader />
-          <Grid container sx={{ flex: 1, overflow: "hidden" }}>
-            <Grid xs={12} md={6} lg={4}>
-              <EditQuestionBody />
-            </Grid>
-            <Grid xs={12} md={6} lg={8} sx={{ height: "100%" }}>
-              <EditVariants />
-            </Grid>
-          </Grid>
-          <EditVariantModal />
-          <ReviewPrModal />
-          <RestoreFormHistory id={questionId} />
-        </FormProvider>
+        <QuestionEditor />
       </AppLayout.Main>
     </>
   );
diff --git a/apps/next-app/pages/questions/[questionId]/types/edit-question-form-values.ts b/apps/next-app/pages/questions/[questionId]/types/edit-question-form-values.ts
deleted file mode 100644
index 45b48af80..000000000
--- a/apps/next-app/pages/questions/[questionId]/types/edit-question-form-values.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import type { RouterInput } from "@chair-flight/trpc/client";
-
-export type EditQuestionFormValues = RouterInput["questions"]["updateQuestion"];
diff --git a/libs/react/components/project.json b/libs/react/components/project.json
index e9c5c96f0..0575cae84 100644
--- a/libs/react/components/project.json
+++ b/libs/react/components/project.json
@@ -16,7 +16,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "tsc -p libs/react/components/tsconfig.json --noEmit",
+          "tsc -p libs/react/components/tsconfig.lib.json --noEmit",
           "tsc -p libs/react/components/tsconfig.spec.json --noEmit"
         ]
       }
diff --git a/libs/react/components/tsconfig.json b/libs/react/components/tsconfig.json
index a90be7480..682077156 100644
--- a/libs/react/components/tsconfig.json
+++ b/libs/react/components/tsconfig.json
@@ -1,9 +1,11 @@
 {
   "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "jsx": "preserve",
-    "lib": ["dom"]
-  },
-  "exclude": ["**/*.test.ts", "**/*.test.tsx"],
-  "include": ["**/*.ts", "**/*.tsx"]
+  "references": [
+    {
+      "path": "./tsconfig.lib.json"
+    },
+    {
+      "path": "./tsconfig.spec.json"
+    }
+  ]
 }
diff --git a/libs/react/components/tsconfig.lib.json b/libs/react/components/tsconfig.lib.json
new file mode 100644
index 000000000..a857468d3
--- /dev/null
+++ b/libs/react/components/tsconfig.lib.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "lib": ["dom"]
+  },
+  "files": [
+    "../../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../../node_modules/@nx/next/typings/image.d.ts"
+  ],
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx"]
+}
diff --git a/libs/react/components/tsconfig.spec.json b/libs/react/components/tsconfig.spec.json
index b66e5c5ed..24bacd0ba 100644
--- a/libs/react/components/tsconfig.spec.json
+++ b/libs/react/components/tsconfig.spec.json
@@ -1,8 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "types": ["node", "vitest"],
-    "jsx": "react"
+    "lib": ["dom"],
+    "types": ["vitest/globals", "@testing-library/jest-dom"]
   },
   "include": ["src/**/*.test.ts", "src/**/*.test.tsx", "vite.config.ts"]
 }
diff --git a/libs/react/containers/project.json b/libs/react/containers/project.json
index 6149a8f00..e075e7552 100644
--- a/libs/react/containers/project.json
+++ b/libs/react/containers/project.json
@@ -16,7 +16,7 @@
       "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "tsc -p libs/react/containers/tsconfig.json --noEmit",
+          "tsc -p libs/react/containers/tsconfig.lib.json --noEmit",
           "tsc -p libs/react/containers/tsconfig.spec.json --noEmit"
         ]
       }
diff --git a/libs/react/containers/src/__tests__/decorators.tsx b/libs/react/containers/src/__tests__/decorators.tsx
index 990599b4b..8386939f0 100644
--- a/libs/react/containers/src/__tests__/decorators.tsx
+++ b/libs/react/containers/src/__tests__/decorators.tsx
@@ -1,10 +1,10 @@
-import { trpc } from '@chair-flight/trpc/client';
-import { CssBaseline, CssVarsProvider } from '@mui/joy';
-import { RouterContext } from 'next/dist/shared/lib/router-context';
-import { FunctionComponent, Suspense } from 'react';
-import { mswDecorator } from 'msw-storybook-addon';
+import { Suspense } from "react";
+import { RouterContext } from "next/dist/shared/lib/router-context";
+import { CssBaseline, CssVarsProvider } from "@mui/joy";
+import { vi } from "vitest";
+import { trpc } from "@chair-flight/trpc/client";
 import { theme } from "../theme";
-import { vi } from 'vitest';
+import type { FunctionComponent } from "react";
 
 export const action = vi.fn();
 
@@ -20,56 +20,57 @@ export const decorators = [
       <Story />
     </CssVarsProvider>
   ),
+  // Typing "other" would be too much of a hassle
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (Story: FunctionComponent, other: any) => (
     <RouterContext.Provider
       value={{
         push(...args: unknown[]) {
-          action('nextRouter.push')(...args);
+          action("nextRouter.push")(...args);
           return Promise.resolve(true);
         },
         replace(...args: unknown[]) {
-          action('nextRouter.replace')(...args);
+          action("nextRouter.replace")(...args);
           return Promise.resolve(true);
         },
         reload(...args: unknown[]) {
-          action('nextRouter.reload')(...args);
+          action("nextRouter.reload")(...args);
         },
         back(...args: unknown[]) {
-          action('nextRouter.back')(...args);
+          action("nextRouter.back")(...args);
         },
         forward() {
-          action('nextRouter.forward')();
+          action("nextRouter.forward")();
         },
         prefetch(...args: unknown[]) {
-          action('nextRouter.prefetch')(...args);
+          action("nextRouter.prefetch")(...args);
           return Promise.resolve();
         },
         beforePopState(...args: unknown[]) {
-          action('nextRouter.beforePopState')(...args);
+          action("nextRouter.beforePopState")(...args);
         },
         events: {
           on(...args: unknown[]) {
-            action('nextRouter.events.on')(...args);
+            action("nextRouter.events.on")(...args);
           },
           off(...args: unknown[]) {
-            action('nextRouter.events.off')(...args);
+            action("nextRouter.events.off")(...args);
           },
           emit(...args: unknown[]) {
-            action('nextRouter.events.emit')(...args);
+            action("nextRouter.events.emit")(...args);
           },
         },
         locale: other?.globals?.locale,
-        route: '/',
-        asPath: '/',
-        basePath: '/',
+        route: "/",
+        asPath: "/",
+        basePath: "/",
         isFallback: false,
         isLocaleDomain: false,
         isReady: true,
         isPreview: false,
-        pathname: '/',
+        pathname: "/",
         query: {},
         ...other?.parameters.nextjs?.router,
-  
       }}
     >
       <Story />
@@ -79,6 +80,4 @@ export const decorators = [
     const Component = trpc.withTRPC(Story);
     return <Component />;
   },
-  mswDecorator,
 ];
-
diff --git a/libs/react/containers/src/__tests__/setup-tests.ts b/libs/react/containers/src/__tests__/setup-tests.ts
index 4a0b0bea6..e24562533 100644
--- a/libs/react/containers/src/__tests__/setup-tests.ts
+++ b/libs/react/containers/src/__tests__/setup-tests.ts
@@ -1,19 +1,13 @@
 import * as matchers from "@testing-library/jest-dom/matchers";
 import { cleanup } from "@testing-library/react";
 import { afterEach, expect, vi } from "vitest";
-import { initialize } from "msw-storybook-addon";
 
 expect.extend(matchers);
 
-initialize({
-  onUnhandledRequest: 'error',
-});
-
-
 beforeAll(() => {
-  Object.defineProperty(window, 'matchMedia', {
+  Object.defineProperty(window, "matchMedia", {
     writable: true,
-    value: vi.fn().mockImplementation(query => ({
+    value: vi.fn().mockImplementation((query) => ({
       matches: false,
       media: query,
       onchange: null,
@@ -23,11 +17,9 @@ beforeAll(() => {
       removeEventListener: vi.fn(),
       dispatchEvent: vi.fn(),
     })),
-  })
+  });
 });
 
 afterEach(() => {
   cleanup();
 });
-
-
diff --git a/libs/react/containers/src/index.ts b/libs/react/containers/src/index.ts
index d71681618..9c4c081bb 100644
--- a/libs/react/containers/src/index.ts
+++ b/libs/react/containers/src/index.ts
@@ -3,6 +3,7 @@ export * from "./app/app-head";
 export * from "./app/app-header-menu";
 export * from "./app/app-transition";
 export * from "./home-page";
+export * from "./questions/question-editor";
 export * from "./questions/question-review";
 export * from "./questions/question-preview-list";
 export * from "./questions/question-search-demo";
diff --git a/libs/react/containers/src/questions/question-editor/components/input-autocomplete-learning-objectives.tsx b/libs/react/containers/src/questions/question-editor/components/input-autocomplete-learning-objectives.tsx
index 9461ff713..e48355346 100644
--- a/libs/react/containers/src/questions/question-editor/components/input-autocomplete-learning-objectives.tsx
+++ b/libs/react/containers/src/questions/question-editor/components/input-autocomplete-learning-objectives.tsx
@@ -12,6 +12,7 @@ export type InputAutocompleteLearningObjectivesProps = {
 export const InputAutocompleteLearningObjectives = forwardRef<
   HTMLDivElement,
   InputAutocompleteLearningObjectivesProps
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
 >(({ value, onChange, onBlur }, ref) => {
   const [search, setSearch] = useState("");
 
@@ -28,9 +29,6 @@ export const InputAutocompleteLearningObjectives = forwardRef<
     return acc;
   }, {});
 
-  // todo foward this when joy fixes autocomplete
-  ref = ref ?? null;
-
   return (
     <Autocomplete
       multiple
diff --git a/libs/react/containers/src/questions/question-editor/index.ts b/libs/react/containers/src/questions/question-editor/index.ts
new file mode 100644
index 000000000..4211ead0b
--- /dev/null
+++ b/libs/react/containers/src/questions/question-editor/index.ts
@@ -0,0 +1 @@
+export { QuestionEditor } from "./question-editor";
diff --git a/libs/react/containers/src/questions/question-editor/question-editor.stories.tsx b/libs/react/containers/src/questions/question-editor/question-editor.stories.tsx
index e65b1a44c..963c3e389 100644
--- a/libs/react/containers/src/questions/question-editor/question-editor.stories.tsx
+++ b/libs/react/containers/src/questions/question-editor/question-editor.stories.tsx
@@ -1,9 +1,6 @@
 import { mockQuestion, trpcMsw } from "@chair-flight/trpc/mock";
-import { trpc } from "@chair-flight/trpc/client";
 import { QuestionEditor } from "./question-editor";
 import type { Meta, StoryObj } from "@storybook/react";
-import { rest } from "msw";
-import { useEffect, useState } from "react";
 
 type Story = StoryObj<typeof QuestionEditor>;
 
@@ -48,18 +45,6 @@ export const VariantOneTwoEditor: Story = {
   },
 };
 
-export const VariantSTupid: Story = {
-  render: () => {
-    const [a, setA] = useState("potato");
-    
-    trpc.questions.getQuestionFromGithub.useQuery({
-      questionId: "124",
-    });
-
-    return <h1>{a}</h1>
-  }
-}
-
 const meta: Meta<typeof QuestionEditor> = {
   title: "Containers/Questions/QuestionEditor",
   component: QuestionEditor,
@@ -73,12 +58,17 @@ const meta: Meta<typeof QuestionEditor> = {
     },
     msw: [
       trpcMsw.questions.getQuestionFromGithub.query((req, res, ctx) => {
-        console.log("potatooooo");
         return res(
           ctx.status(200),
           ctx.data({ questionTemplate: mockQuestion }),
         );
       }),
+      trpcMsw.search.searchLearningObjectives.query((req, res, ctx) => {
+        return res(
+          ctx.status(200),
+          ctx.data({ items: [], totalResults: 0, nextCursor: -1 }),
+        );
+      }),
     ],
   },
 };
diff --git a/libs/react/containers/src/questions/question-editor/question-editor.test.tsx b/libs/react/containers/src/questions/question-editor/question-editor.test.tsx
index 068f2f79d..c32f58364 100644
--- a/libs/react/containers/src/questions/question-editor/question-editor.test.tsx
+++ b/libs/react/containers/src/questions/question-editor/question-editor.test.tsx
@@ -1,43 +1,34 @@
-import { composeStories } from '@storybook/react';
-import * as stories from './question-editor.stories';
-import { render, screen, waitForElementToBeRemoved } from '@testing-library/react';
-import { default as userEvent } from '@testing-library/user-event';
-import { decorators } from '../../__tests__/decorators'
-import { setupServer } from 'msw/node';
-import { rest } from 'msw';
-import { useEffect, useState } from 'react';
-import { getWorker } from 'msw-storybook-addon';
-
-const { BasePage, VariantSTupid } = composeStories(stories, { decorators });
-
-describe('QuestionEditor', () => {
-
-
-    it('is possible to create a new variant', async () => {
-        render(<BasePage />);
-
-        const loading = screen.getByText("Loading...");
-        await waitForElementToBeRemoved(loading);
-
-
-
-        //const initialCards = await screen.findAllByTestId('variant-card');
-        //const addButton = screen.getByRole('button', { name: /new variant/i });
-        //await userEvent.click(addButton,);
-        //const newCards = await screen.findAllByTestId('variant-card');
-        //expect(initialCards.length + 1).toBe(newCards.length);
-    });
-
-    it.only("works with really simple case", async () => {
-
-        render(<VariantSTupid />);
-
-        //getWorker().listHandlers();
-    
-        await screen.findByText("potato");
-        await screen.findByText("starting");
-       // await waitForElementToBeRemoved(loading);
-
-    })
+import { composeStories } from "@storybook/react";
+import { render, screen } from "@testing-library/react";
+import { default as userEvent } from "@testing-library/user-event";
+import { setupServer } from "msw/node";
+import { afterAll, afterEach, beforeAll } from "vitest";
+import { decorators } from "../../__tests__/decorators";
+import * as stories from "./question-editor.stories";
+
+const { BasePage } = composeStories(stories, { decorators });
+const server = setupServer(...(stories.default.parameters?.["msw"] ?? []));
+
+describe("QuestionEditor", () => {
+  beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
+  afterEach(() => server.resetHandlers());
+  afterAll(() => server.close());
+
+  it.skip("is possible to create a new variant", async () => {
+    render(<BasePage />);
+    const initialCards = await screen.findAllByTestId("variant-card");
+    const addButton = screen.getByRole("button", { name: /new variant/i });
+    await userEvent.click(addButton);
+    const newCards = await screen.findAllByTestId("variant-card");
+    expect(initialCards.length + 1).toBe(newCards.length);
+  });
+
+  it.skip("is possible to delete a variant", async () => {
+    render(<BasePage />);
+    const initialCards = await screen.findAllByTestId("variant-card");
+    const deleteButton = screen.getByRole("button", { name: /delete/i });
+    await userEvent.click(deleteButton);
+    const newCards = await screen.findAllByTestId("variant-card");
+    expect(initialCards.length - 1).toBe(newCards.length);
+  });
 });
-
diff --git a/libs/react/containers/src/questions/question-editor/question-editor.tsx b/libs/react/containers/src/questions/question-editor/question-editor.tsx
index c73a698da..7335bcd65 100644
--- a/libs/react/containers/src/questions/question-editor/question-editor.tsx
+++ b/libs/react/containers/src/questions/question-editor/question-editor.tsx
@@ -11,7 +11,6 @@ import { EditVariantModal } from "./components/edit-variant-modal";
 import { EditVariants } from "./components/edit-variants";
 import { ReviewPrModal } from "./review-pr-modal";
 import type { EditQuestionFormValues } from "./types/edit-question-form-values";
-import { useEffect } from "react";
 
 const resolver = zodResolver(questionEditSchema);
 const useQuestion = trpc.questions.getQuestionFromGithub.useSuspenseQuery;
diff --git a/libs/react/containers/tsconfig.json b/libs/react/containers/tsconfig.json
index a7683e04c..682077156 100644
--- a/libs/react/containers/tsconfig.json
+++ b/libs/react/containers/tsconfig.json
@@ -1,10 +1,5 @@
 {
   "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "lib": ["dom"]
-  },
-  "files": [],
-  "include": [],
   "references": [
     {
       "path": "./tsconfig.lib.json"
@@ -13,4 +8,4 @@
       "path": "./tsconfig.spec.json"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/libs/react/containers/tsconfig.lib.json b/libs/react/containers/tsconfig.lib.json
index c7aaf747e..a857468d3 100644
--- a/libs/react/containers/tsconfig.lib.json
+++ b/libs/react/containers/tsconfig.lib.json
@@ -1,16 +1,12 @@
 {
   "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {},
+  "compilerOptions": {
+    "lib": ["dom"]
+  },
   "files": [
     "../../../node_modules/@nx/react/typings/cssmodule.d.ts",
     "../../../node_modules/@nx/next/typings/image.d.ts"
   ],
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx",
-  ],
-  "exclude": [
-    "src/**/*.test.ts", 
-    "src/**/*.test.tsx"
-  ]
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
+  "exclude": ["src/**/*.test.ts", "src/**/*.test.tsx"]
 }
diff --git a/libs/react/containers/tsconfig.spec.json b/libs/react/containers/tsconfig.spec.json
index d498ea5d8..1205898b6 100644
--- a/libs/react/containers/tsconfig.spec.json
+++ b/libs/react/containers/tsconfig.spec.json
@@ -1,15 +1,8 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "moduleResolution": "NodeNext",
-    "module": "ESNext",
-    "target": "ESNext",
-    "types": ["node", "jest",  "@testing-library/jest-dom"]
+    "lib": ["DOM"],
+    "types": ["vitest/globals", "@testing-library/jest-dom"]
   },
-  "include": [
-    "src/**/*.test.ts", 
-    "src/**/*.test.tsx",
-    "src/__tests__/**/*",
-    "jest.config.ts"
-  ]
+  "include": ["src/**/*.test.ts", "src/**/*.test.tsx", "vite.config.ts"]
 }
diff --git a/libs/trpc/client/src/index.ts b/libs/trpc/client/src/index.ts
index fc001637a..083a83248 100644
--- a/libs/trpc/client/src/index.ts
+++ b/libs/trpc/client/src/index.ts
@@ -1,42 +1,7 @@
-import { httpBatchLink } from "@trpc/client";
-import { createTRPCNext } from "@trpc/next";
-import { getEnvVariableOrDefault } from "@chair-flight/base/env";
 import type { AppRouter } from "@chair-flight/trpc/server";
 import type { inferRouterInputs, inferRouterOutputs } from "@trpc/server";
 
-const getBaseUrl = (): string => {
-  if (typeof window !== "undefined") return "";
-
-  const VERCEL_URL = getEnvVariableOrDefault("VERCEL_URL", "");
-  if (VERCEL_URL) return `https://${VERCEL_URL}`;
-
-  const PORT = getEnvVariableOrDefault("PORT", "3000");
-  return `http://localhost:${PORT}`;
-};
-
-export const trpc = createTRPCNext<AppRouter>({
-  config() {
-    return {
-      links: [
-        httpBatchLink({
-          url: `${getBaseUrl()}/api/trpc`,
-        }),
-      ],
-      queryClientConfig: {
-        defaultOptions: {
-          queries: {
-            refetchOnMount: false,
-            refetchOnWindowFocus: false,
-            networkMode: "always",
-          },
-          mutations: {
-            networkMode: "always",
-          },
-        },
-      },
-    };
-  },
-});
+export { trpc } from "./trpc-next";
 
 export type RouterInput = inferRouterInputs<AppRouter>;
 export type RouterOutput = inferRouterOutputs<AppRouter>;
diff --git a/libs/trpc/client/src/trpc-next.ts b/libs/trpc/client/src/trpc-next.ts
new file mode 100644
index 000000000..a7c8aa43d
--- /dev/null
+++ b/libs/trpc/client/src/trpc-next.ts
@@ -0,0 +1,39 @@
+import { httpLink } from "@trpc/client";
+import { createTRPCNext } from "@trpc/next";
+import { getEnvVariableOrDefault } from "@chair-flight/base/env";
+import type { AppRouter } from "@chair-flight/trpc/server";
+import type { QueryClientConfig } from "@tanstack/react-query";
+
+const getBaseUrl = (): string => {
+  const env = getEnvVariableOrDefault("NODE_ENV", "");
+  const VERCEL_URL = getEnvVariableOrDefault("VERCEL_URL", "");
+  const PORT = getEnvVariableOrDefault("PORT", "3000");
+
+  if (env === "test") return `http://localhost:${PORT}`;
+
+  if (typeof window !== "undefined") return "";
+
+  if (VERCEL_URL) return `https://${VERCEL_URL}`;
+
+  return `http://localhost:${PORT}`;
+};
+
+const queryClientConfig: QueryClientConfig = {
+  defaultOptions: {
+    queries: {
+      refetchOnMount: false,
+      refetchOnWindowFocus: false,
+
+      networkMode: "always",
+    },
+    mutations: {
+      networkMode: "always",
+    },
+  },
+};
+
+const links = [httpLink({ url: `${getBaseUrl()}/api/trpc` })];
+
+export const trpc = createTRPCNext<AppRouter>({
+  config: () => ({ queryClientConfig, links }),
+});
diff --git a/libs/trpc/client/tsconfig.json b/libs/trpc/client/tsconfig.json
index 9cebd4d34..aa24f21d4 100644
--- a/libs/trpc/client/tsconfig.json
+++ b/libs/trpc/client/tsconfig.json
@@ -1,9 +1,9 @@
 {
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
-    "lib": ["DOM"]
+    "lib": ["dom"]
   },
   "files": [],
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.tsx", "../mock/src/trpc-mock.tsx"],
   "references": []
 }
diff --git a/libs/trpc/mock/src/__mocks__/trpc-next.mock.tsx b/libs/trpc/mock/src/__mocks__/trpc-next.mock.tsx
new file mode 100644
index 000000000..811111ac5
--- /dev/null
+++ b/libs/trpc/mock/src/__mocks__/trpc-next.mock.tsx
@@ -0,0 +1,6 @@
+import { createTRPCReact } from "@trpc/react-query";
+import { AppRouter } from "@chair-flight/trpc/server";
+
+const trpc = createTRPCReact<AppRouter>();
+
+export { trpc };
diff --git a/libs/trpc/mock/tsconfig.json b/libs/trpc/mock/tsconfig.json
index 847c4f244..487598ebd 100644
--- a/libs/trpc/mock/tsconfig.json
+++ b/libs/trpc/mock/tsconfig.json
@@ -2,6 +2,6 @@
   "extends": "../../../tsconfig.base.json",
   "compilerOptions": {},
   "files": [],
-  "include": ["src/**/*.ts"],
+  "include": ["src/**/*.ts", "src/**/*.tsx"],
   "references": []
 }
diff --git a/nx.json b/nx.json
index b57d12469..6e2b174d0 100644
--- a/nx.json
+++ b/nx.json
@@ -16,39 +16,21 @@
   },
   "targetDefaults": {
     "build": {
-      "dependsOn": [
-        "^build"
-      ],
-      "inputs": [
-        "production",
-        "^production"
-      ]
+      "dependsOn": ["^build"],
+      "inputs": ["production", "^production"]
     },
     "test": {
-      "inputs": [
-        "default",
-        "^production",
-        "{workspaceRoot}/jest.preset.js"
-      ]
+      "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"]
     },
     "e2e": {
-      "inputs": [
-        "default",
-        "^production"
-      ]
+      "inputs": ["default", "^production"]
     },
     "lint": {
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json"
-      ]
+      "inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
     }
   },
   "namedInputs": {
-    "default": [
-      "{projectRoot}/**/*",
-      "sharedGlobals"
-    ],
+    "default": ["{projectRoot}/**/*", "sharedGlobals"],
     "production": [
       "default",
       "!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
@@ -60,18 +42,6 @@
       "!{projectRoot}/src/test-setup.[jt]s",
       "!{projectRoot}/test-setup.[jt]s"
     ],
-    "sharedGlobals": [
-      "{workspaceRoot}/babel.config.json"
-    ]
-  },
-  "generators": {
-    "@nx/react": {
-      "application": {
-        "babel": true
-      },
-      "library": {
-        "unitTestRunner": "jest"
-      }
-    }
+    "sharedGlobals": ["{workspaceRoot}/babel.config.json"]
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4a9247dbe..fb66bfae8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -270,6 +270,9 @@ devDependencies:
   '@vitest/ui':
     specifier: ^0.34.1
     version: 0.34.1(vitest@0.34.1)
+  cross-fetch:
+    specifier: ^4.0.0
+    version: 4.0.0
   cypress:
     specifier: ^12.17.3
     version: 12.17.3
@@ -9345,6 +9348,14 @@ packages:
     resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
     dev: true
 
+  /cross-fetch@4.0.0:
+    resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==}
+    dependencies:
+      node-fetch: 2.6.12
+    transitivePeerDependencies:
+      - encoding
+    dev: true
+
   /cross-spawn@7.0.3:
     resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
     engines: {node: '>= 8'}
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 00a16b350..54cef3ad1 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -16,7 +16,7 @@
     "forceConsistentCasingInFileNames": true,
     "noPropertyAccessFromIndexSignature": true,
     "esModuleInterop": false,
-    "allowSyntheticDefaultImports": false,
+    "allowSyntheticDefaultImports": true,
     "noFallthroughCasesInSwitch": true,
     "resolveJsonModule": true,
     "noImplicitReturns": true,
@@ -24,63 +24,32 @@
     "experimentalDecorators": true,
     "declaration": false,
     "importHelpers": true,
-    "lib": [
-      "esnext"
-    ],
+    "lib": ["esnext"],
     "jsx": "preserve",
     "paths": {
-      "@chair-flight/base/env": [
-        "libs/base/env/src/index.ts"
-      ],
-      "@chair-flight/base/errors": [
-        "libs/base/errors/src/index.ts"
-      ],
-      "@chair-flight/base/types": [
-        "libs/base/types/src/index.ts"
-      ],
-      "@chair-flight/core/app": [
-        "libs/core/app/src/index.ts"
-      ],
-      "@chair-flight/core/schemas": [
-        "libs/core/schemas/src/index.ts"
-      ],
+      "@chair-flight/base/env": ["libs/base/env/src/index.ts"],
+      "@chair-flight/base/errors": ["libs/base/errors/src/index.ts"],
+      "@chair-flight/base/types": ["libs/base/types/src/index.ts"],
+      "@chair-flight/core/app": ["libs/core/app/src/index.ts"],
+      "@chair-flight/core/schemas": ["libs/core/schemas/src/index.ts"],
       "@chair-flight/providers/analytics": [
         "libs/providers/analytics/src/index.ts"
       ],
-      "@chair-flight/providers/github": [
-        "libs/providers/github/src/index.ts"
-      ],
+      "@chair-flight/providers/github": ["libs/providers/github/src/index.ts"],
       "@chair-flight/providers/question-bank-local": [
         "libs/providers/question-bank-local/src/index.ts"
       ],
       "@chair-flight/providers/question-bank-redis": [
         "libs/providers/question-bank-redis/src/index.ts"
       ],
-      "@chair-flight/react/analytics": [
-        "libs/react/analytics/src/index.ts"
-      ],
-      "@chair-flight/react/components": [
-        "libs/react/components/src/index.ts"
-      ],
-      "@chair-flight/react/containers": [
-        "libs/react/containers/src/index.ts"
-      ],
-      "@chair-flight/react/games": [
-        "libs/react/games/src/index.ts"
-      ],
-      "@chair-flight/trpc/client": [
-        "libs/trpc/client/src/index.ts"
-      ],
-      "@chair-flight/trpc/mock": [
-        "libs/trpc/mock/src/index.ts"
-      ],
-      "@chair-flight/trpc/server": [
-        "libs/trpc/server/src/index.ts"
-      ]
+      "@chair-flight/react/analytics": ["libs/react/analytics/src/index.ts"],
+      "@chair-flight/react/components": ["libs/react/components/src/index.ts"],
+      "@chair-flight/react/containers": ["libs/react/containers/src/index.ts"],
+      "@chair-flight/react/games": ["libs/react/games/src/index.ts"],
+      "@chair-flight/trpc/client": ["libs/trpc/client/src/index.ts"],
+      "@chair-flight/trpc/mock": ["libs/trpc/mock/src/index.ts"],
+      "@chair-flight/trpc/server": ["libs/trpc/server/src/index.ts"]
     }
   },
-  "exclude": [
-    "node_modules",
-    "tmp"
-  ]
+  "exclude": ["node_modules", "tmp"]
 }