diff --git a/nextjs/src/app/layout.tsx b/nextjs/src/app/layout.tsx
index 782c845..bd6be97 100644
--- a/nextjs/src/app/layout.tsx
+++ b/nextjs/src/app/layout.tsx
@@ -2,7 +2,6 @@ import type { Metadata } from "next";
 import "./globals.css";
 import Providers from "./providers";
 import { Suspense } from "react";
-import { hydrateCourses } from "@/hooks/hookHydration";
 import { dehydrate, HydrationBoundary } from "@tanstack/react-query";
 import { MyToaster } from "./MyToaster";
 import { createServerSideHelpers } from "@trpc/react-query/server";
@@ -58,22 +57,39 @@ async function DataHydration({
   });
 
   const allSettings = await fileStorageService.settings.getAllCoursesSettings();
-  // assignments
+
   await Promise.all(
     allSettings.map(async (settings) => {
       const courseName = settings.name;
-      const moduleNames = await fileStorageService.modules.getModuleNames(
-        courseName
-      );
-      await Promise.all(
-        moduleNames.map(
+      const moduleNames = await trpcHelper.module.getModuleNames.fetch({
+        courseName,
+      });
+      await Promise.all([
+        // assignments
+        ...moduleNames.map(
           async (moduleName) =>
-            await trpcHelper.assignment.getAllAssignments.fetch({
+            await trpcHelper.assignment.getAllAssignments.prefetch({
               courseName,
               moduleName,
             })
-        )
-      );
+        ),
+        // quizzes
+        ...moduleNames.map(
+          async (moduleName) =>
+            await trpcHelper.quiz.getAllQuizzes.prefetch({
+              courseName,
+              moduleName,
+            })
+        ),
+        // pages
+        ...moduleNames.map(
+          async (moduleName) =>
+            await trpcHelper.page.getAllPages.prefetch({
+              courseName,
+              moduleName,
+            })
+        ),
+      ]);
     })
   );
 
@@ -87,8 +103,6 @@ async function DataHydration({
     )
   );
 
-  // await hydrateCourses(trpcHelper.queryClient);
-
   const dehydratedState = dehydrate(trpcHelper.queryClient);
   console.log("ran hydration");
 
diff --git a/nextjs/src/hooks/hookHydration.ts b/nextjs/src/hooks/hookHydration.ts
index 63d39b3..480a895 100644
--- a/nextjs/src/hooks/hookHydration.ts
+++ b/nextjs/src/hooks/hookHydration.ts
@@ -1,208 +1,208 @@
-import { QueryClient } from "@tanstack/react-query";
-import { localCourseKeys } from "./localCourse/localCourseKeys";
-import { fileStorageService } from "@/services/fileStorage/fileStorageService";
-import { LocalCourseSettings } from "@/models/local/localCourseSettings";
-import { canvasAssignmentService } from "@/services/canvas/canvasAssignmentService";
-import { canvasAssignmentKeys } from "./canvas/canvasAssignmentHooks";
-import { LocalAssignment } from "@/models/local/assignment/localAssignment";
-import { LocalCoursePage } from "@/models/local/page/localCoursePage";
-import { LocalQuiz } from "@/models/local/quiz/localQuiz";
-import { canvasQuizService } from "@/services/canvas/canvasQuizService";
-import { canvasPageService } from "@/services/canvas/canvasPageService";
-import { canvasQuizKeys } from "./canvas/canvasQuizHooks";
-import { canvasPageKeys } from "./canvas/canvasPageHooks";
-// import { getLecturesQueryConfig } from "./localCourse/lectureHooks";
+// import { QueryClient } from "@tanstack/react-query";
+// import { localCourseKeys } from "./localCourse/localCourseKeys";
+// import { fileStorageService } from "@/services/fileStorage/fileStorageService";
+// import { LocalCourseSettings } from "@/models/local/localCourseSettings";
+// import { canvasAssignmentService } from "@/services/canvas/canvasAssignmentService";
+// import { canvasAssignmentKeys } from "./canvas/canvasAssignmentHooks";
+// import { LocalAssignment } from "@/models/local/assignment/localAssignment";
+// import { LocalCoursePage } from "@/models/local/page/localCoursePage";
+// import { LocalQuiz } from "@/models/local/quiz/localQuiz";
+// import { canvasQuizService } from "@/services/canvas/canvasQuizService";
+// import { canvasPageService } from "@/services/canvas/canvasPageService";
+// import { canvasQuizKeys } from "./canvas/canvasQuizHooks";
+// import { canvasPageKeys } from "./canvas/canvasPageHooks";
+// // import { getLecturesQueryConfig } from "./localCourse/lectureHooks";
 
-// https://tanstack.com/query/latest/docs/framework/react/guides/ssr
-export const hydrateCourses = async (queryClient: QueryClient) => {
-  const allSettings = await fileStorageService.settings.getAllCoursesSettings();
-  await queryClient.prefetchQuery({
-    queryKey: localCourseKeys.allCoursesSettings,
-    queryFn: () => allSettings,
-  });
+// // https://tanstack.com/query/latest/docs/framework/react/guides/ssr
+// export const hydrateCourses = async (queryClient: QueryClient) => {
+//   const allSettings = await fileStorageService.settings.getAllCoursesSettings();
+//   await queryClient.prefetchQuery({
+//     queryKey: localCourseKeys.allCoursesSettings,
+//     queryFn: () => allSettings,
+//   });
 
-  await Promise.all(
-    allSettings.map(async (settings) => {
-      await hydrateCourse(queryClient, settings);
-    })
-  );
-};
+//   await Promise.all(
+//     allSettings.map(async (settings) => {
+//       await hydrateCourse(queryClient, settings);
+//     })
+//   );
+// };
 
-export const hydrateCourse = async (
-  queryClient: QueryClient,
-  courseSettings: LocalCourseSettings
-) => {
-  const courseName = courseSettings.name;
-  const moduleNames = await fileStorageService.modules.getModuleNames(
-    courseName
-  );
+// export const hydrateCourse = async (
+//   queryClient: QueryClient,
+//   courseSettings: LocalCourseSettings
+// ) => {
+//   const courseName = courseSettings.name;
+//   const moduleNames = await fileStorageService.modules.getModuleNames(
+//     courseName
+//   );
 
-  // await Promise.all(
-  //   moduleNames.map(async (moduleName) => {
-  //     const assignments = await trpcHelpers.assignment.getAllAssignments.fetch({
-  //       courseName,
-  //       moduleName,
-  //     });
-  //     await Promise.all(
-  //       assignments.map(
-  //         async (a) =>
-  //           await trpcHelpers.assignment.getAssignment.fetch({
-  //             courseName,
-  //             moduleName,
-  //             assignmentName: a.name,
-  //           })
-  //       )
-  //     );
-  //   })
-  // );
+//   // await Promise.all(
+//   //   moduleNames.map(async (moduleName) => {
+//   //     const assignments = await trpcHelpers.assignment.getAllAssignments.fetch({
+//   //       courseName,
+//   //       moduleName,
+//   //     });
+//   //     await Promise.all(
+//   //       assignments.map(
+//   //         async (a) =>
+//   //           await trpcHelpers.assignment.getAssignment.fetch({
+//   //             courseName,
+//   //             moduleName,
+//   //             assignmentName: a.name,
+//   //           })
+//   //       )
+//   //     );
+//   //   })
+//   // );
 
-  const modulesData = await Promise.all(
-    moduleNames.map((moduleName) => loadAllModuleData(courseName, moduleName))
-  );
+//   const modulesData = await Promise.all(
+//     moduleNames.map((moduleName) => loadAllModuleData(courseName, moduleName))
+//   );
 
-  // await queryClient.prefetchQuery(getLecturesQueryConfig(courseName));
+//   // await queryClient.prefetchQuery(getLecturesQueryConfig(courseName));
 
-  await queryClient.prefetchQuery({
-    queryKey: localCourseKeys.settings(courseName),
-    queryFn: () => courseSettings,
-  });
-  await queryClient.prefetchQuery({
-    queryKey: localCourseKeys.moduleNames(courseName),
-    queryFn: () => moduleNames,
-  });
+//   await queryClient.prefetchQuery({
+//     queryKey: localCourseKeys.settings(courseName),
+//     queryFn: () => courseSettings,
+//   });
+//   await queryClient.prefetchQuery({
+//     queryKey: localCourseKeys.moduleNames(courseName),
+//     queryFn: () => moduleNames,
+//   });
 
-  await Promise.all(
-    modulesData.map((d) => hydrateModuleData(d, courseName, queryClient))
-  );
-};
+//   await Promise.all(
+//     modulesData.map((d) => hydrateModuleData(d, courseName, queryClient))
+//   );
+// };
 
-export const hydrateCanvasCourse = async (
-  canvasCourseId: number,
-  queryClient: QueryClient
-) => {
-  await Promise.all([
-    queryClient.prefetchQuery({
-      queryKey: canvasAssignmentKeys.assignments(canvasCourseId),
-      queryFn: async () => await canvasAssignmentService.getAll(canvasCourseId),
-    }),
-    queryClient.prefetchQuery({
-      queryKey: canvasQuizKeys.quizzes(canvasCourseId),
-      queryFn: async () => await canvasQuizService.getAll(canvasCourseId),
-    }),
-    queryClient.prefetchQuery({
-      queryKey: canvasPageKeys.pagesInCourse(canvasCourseId),
-      queryFn: async () => await canvasPageService.getAll(canvasCourseId),
-    }),
-  ]);
-};
+// export const hydrateCanvasCourse = async (
+//   canvasCourseId: number,
+//   queryClient: QueryClient
+// ) => {
+//   await Promise.all([
+//     queryClient.prefetchQuery({
+//       queryKey: canvasAssignmentKeys.assignments(canvasCourseId),
+//       queryFn: async () => await canvasAssignmentService.getAll(canvasCourseId),
+//     }),
+//     queryClient.prefetchQuery({
+//       queryKey: canvasQuizKeys.quizzes(canvasCourseId),
+//       queryFn: async () => await canvasQuizService.getAll(canvasCourseId),
+//     }),
+//     queryClient.prefetchQuery({
+//       queryKey: canvasPageKeys.pagesInCourse(canvasCourseId),
+//       queryFn: async () => await canvasPageService.getAll(canvasCourseId),
+//     }),
+//   ]);
+// };
 
-const loadAllModuleData = async (courseName: string, moduleName: string) => {
-  const [pages, quizzes] = await Promise.all([
-    // await fileStorageService.assignments.getAssignmentNames(
-    //   courseName,
-    //   moduleName
-    // ),
-    await fileStorageService.pages.getPages(courseName, moduleName),
-    await fileStorageService.quizzes.getQuizzes(courseName, moduleName),
-  ]);
+// const loadAllModuleData = async (courseName: string, moduleName: string) => {
+//   const [pages, quizzes] = await Promise.all([
+//     // await fileStorageService.assignments.getAssignmentNames(
+//     //   courseName,
+//     //   moduleName
+//     // ),
+//     await fileStorageService.pages.getPages(courseName, moduleName),
+//     await fileStorageService.quizzes.getQuizzes(courseName, moduleName),
+//   ]);
 
-  // const [assignments] = await Promise.all([
-  //   await Promise.all(
-  //     assignmentNames.map(async (assignmentName) => {
-  //       try {
-  //         return await fileStorageService.assignments.getAssignment(
-  //           courseName,
-  //           moduleName,
-  //           assignmentName
-  //         );
-  //       } catch (error) {
-  //         console.error(`Error fetching assignment: ${assignmentName}`, error);
-  //         return null; // or any other placeholder value
-  //       }
-  //     })
-  //   ),
-  // ]);
+//   // const [assignments] = await Promise.all([
+//   //   await Promise.all(
+//   //     assignmentNames.map(async (assignmentName) => {
+//   //       try {
+//   //         return await fileStorageService.assignments.getAssignment(
+//   //           courseName,
+//   //           moduleName,
+//   //           assignmentName
+//   //         );
+//   //       } catch (error) {
+//   //         console.error(`Error fetching assignment: ${assignmentName}`, error);
+//   //         return null; // or any other placeholder value
+//   //       }
+//   //     })
+//   //   ),
+//   // ]);
 
-  // const assignmentsLoaded = assignments.filter((a) => a !== null);
-  return {
-    moduleName,
-    // assignments: assignmentsLoaded,
-    quizzes,
-    pages,
-  };
-};
+//   // const assignmentsLoaded = assignments.filter((a) => a !== null);
+//   return {
+//     moduleName,
+//     // assignments: assignmentsLoaded,
+//     quizzes,
+//     pages,
+//   };
+// };
 
-const hydrateModuleData = async (
-  {
-    moduleName,
-    // assignments,
-    quizzes,
-    pages,
-  }: {
-    moduleName: string;
-    // assignments: LocalAssignment[];
-    quizzes: LocalQuiz[];
-    pages: LocalCoursePage[];
-  },
-  courseName: string,
-  queryClient: QueryClient
-) => {
-  // await queryClient.prefetchQuery({
-  //   queryKey: localCourseKeys.allItemsOfType(
-  //     courseName,
-  //     moduleName,
-  //     "Assignment"
-  //   ),
-  //   queryFn: () => assignments,
-  // });
-  await queryClient.prefetchQuery({
-    queryKey: localCourseKeys.allItemsOfType(courseName, moduleName, "Quiz"),
-    queryFn: () => quizzes,
-  });
-  await queryClient.prefetchQuery({
-    queryKey: localCourseKeys.allItemsOfType(courseName, moduleName, "Page"),
-    queryFn: () => pages,
-  });
-  // await Promise.all(
-  //   assignments.map(
-  //     async (assignment) =>
-  //       await queryClient.prefetchQuery({
-  //         queryKey: localCourseKeys.itemOfType(
-  //           courseName,
-  //           moduleName,
-  //           assignment.name,
-  //           "Assignment"
-  //         ),
-  //         queryFn: () => assignment,
-  //       })
-  //   )
-  // );
-  await Promise.all(
-    quizzes.map(
-      async (quiz) =>
-        await queryClient.prefetchQuery({
-          queryKey: localCourseKeys.itemOfType(
-            courseName,
-            moduleName,
-            quiz.name,
-            "Quiz"
-          ),
-          queryFn: () => quiz,
-        })
-    )
-  );
-  await Promise.all(
-    pages.map(
-      async (page) =>
-        await queryClient.prefetchQuery({
-          queryKey: localCourseKeys.itemOfType(
-            courseName,
-            moduleName,
-            page.name,
-            "Page"
-          ),
-          queryFn: () => page,
-        })
-    )
-  );
-};
+// const hydrateModuleData = async (
+//   {
+//     moduleName,
+//     // assignments,
+//     quizzes,
+//     pages,
+//   }: {
+//     moduleName: string;
+//     // assignments: LocalAssignment[];
+//     quizzes: LocalQuiz[];
+//     pages: LocalCoursePage[];
+//   },
+//   courseName: string,
+//   queryClient: QueryClient
+// ) => {
+//   // await queryClient.prefetchQuery({
+//   //   queryKey: localCourseKeys.allItemsOfType(
+//   //     courseName,
+//   //     moduleName,
+//   //     "Assignment"
+//   //   ),
+//   //   queryFn: () => assignments,
+//   // });
+//   await queryClient.prefetchQuery({
+//     queryKey: localCourseKeys.allItemsOfType(courseName, moduleName, "Quiz"),
+//     queryFn: () => quizzes,
+//   });
+//   await queryClient.prefetchQuery({
+//     queryKey: localCourseKeys.allItemsOfType(courseName, moduleName, "Page"),
+//     queryFn: () => pages,
+//   });
+//   // await Promise.all(
+//   //   assignments.map(
+//   //     async (assignment) =>
+//   //       await queryClient.prefetchQuery({
+//   //         queryKey: localCourseKeys.itemOfType(
+//   //           courseName,
+//   //           moduleName,
+//   //           assignment.name,
+//   //           "Assignment"
+//   //         ),
+//   //         queryFn: () => assignment,
+//   //       })
+//   //   )
+//   // );
+//   await Promise.all(
+//     quizzes.map(
+//       async (quiz) =>
+//         await queryClient.prefetchQuery({
+//           queryKey: localCourseKeys.itemOfType(
+//             courseName,
+//             moduleName,
+//             quiz.name,
+//             "Quiz"
+//           ),
+//           queryFn: () => quiz,
+//         })
+//     )
+//   );
+//   await Promise.all(
+//     pages.map(
+//       async (page) =>
+//         await queryClient.prefetchQuery({
+//           queryKey: localCourseKeys.itemOfType(
+//             courseName,
+//             moduleName,
+//             page.name,
+//             "Page"
+//           ),
+//           queryFn: () => page,
+//         })
+//     )
+//   );
+// };