diff --git a/README.md b/README.md
index f6e50555..bc5441ff 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,15 @@
 # Boilerplate
 
-This is a simple boilerplate designed to serve as robust template for quickly starting development on a [Typescript](https://www.typescriptlang.org) based [MERN](https://www.mongodb.com/mern-stack) web application.
+This is a web app built for Abuse and Sexual Assault Prevention, a student organization at Penn, as a resource tree for all sexual violence resources at Penn. This is a [Typescript](https://www.typescriptlang.org) based [MERN](https://www.mongodb.com/mern-stack) web application.
 
 ## Features
 
-- Session based authentication with [Passport](https://www.passportjs.org)
-- Emailing for account verification and resetting password with [SendGrid](https://sendgrid.com)
-- Admin functionality for viewing/deleting/promoting other users
-- Clean authentication pages built with [Material UI](https://mui.com)
-- In memory database testing with [Jest](https://jestjs.io) and [Supertest](https://www.npmjs.com/package/supertest)
-- [AirBnb Typescript styling](https://github.com/airbnb/javascript) with [Prettier](https://prettier.io) and [ESLint](https://eslint.org)
-- [Husky](https://typicode.github.io/husky/#/) and [lint-staged](https://github.com/okonet/lint-staged) for checking linting on commits
-- [GitHub Actions](https://docs.github.com/en/actions) for ensuring linting + tests pass on pushes
+- Admin portal with ability to change resources, questions, and answers
+- Rich text editor for answer and question changes
+- Tree-based data structure in backend
+- Private and secure user experience that does not track user data
+- Back and Next buttons, as well as ability to see other resources if different answers were selected
+- Dictionary and side help bar for unkown terms, filtered based on the words in the question/answer/resource
 
 ## Required tools
 
diff --git a/client/src/AdminDashboard/AdminDashboardPage.tsx b/client/src/AdminDashboard/AdminDashboardPage.tsx
index 5e1b7984..3e93eb53 100644
--- a/client/src/AdminDashboard/AdminDashboardPage.tsx
+++ b/client/src/AdminDashboard/AdminDashboardPage.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Typography, Grid } from '@mui/material';
+import { Typography, Grid, AppBar } from '@mui/material';
 import ScreenGrid from '../components/ScreenGrid';
 // import UserTable from './QuestionTable';
 import QuestionTable from './QuestionTable';
diff --git a/client/src/AdminDashboard/EditQuestionButton.tsx b/client/src/AdminDashboard/EditQuestionButton.tsx
index a0f2beff..910bf3d3 100644
--- a/client/src/AdminDashboard/EditQuestionButton.tsx
+++ b/client/src/AdminDashboard/EditQuestionButton.tsx
@@ -39,12 +39,14 @@ function EditQuestionButton({
     text: '2x edited answer text 1',
     resultantQuestionId: '63751d7cc26b48cf7f1d9724',
     resourceContent: '',
+    resourceLink: '',
   };
   const tempAnswer2: IAnswer = {
     _id: '6369a04ee0cca0b76f26576b',
     text: '2x edited answer text 2',
     resultantQuestionId: '63751d7cc26b48cf7f1d9724',
     resourceContent: '',
+    resourceLink: '',
   };
   const tempQuestion: IQuestion = {
     _id: '63699fdbe0cca0b76f26576a',
diff --git a/client/src/App.tsx b/client/src/App.tsx
index 01cc4e65..b9ef4009 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -48,7 +48,7 @@ function App() {
                 <Routes>
                   {/* Routes accessed only if user is not authenticated */}
                   <Route element={<UnauthenticatedRoutesWrapper />}>
-                    <Route path="/login" element={<QuestionPage />} />
+                    <Route path="/login" element={<LoginPage />} />
                     <Route path="/register" element={<RegisterPage />} />
                     <Route
                       path="/verify-account/:token"
@@ -62,23 +62,20 @@ function App() {
                       path="/reset-password/:token"
                       element={<ResetPasswordPage />}
                     />
-                    {/* <Route element={<AdminRoutesWrapper />}> */}
-                    <Route path="/users" element={<AdminDashboardPage />} />
-                    {/* </Route> */}
-                    <Route path="/editResource" element={<EditResource />} />
-                    <Route path="/editQuestion" element={<EditQuestion />} />
+                    <Route path="/home" element={<HomePage />} />
+                    <Route path="/question" element={<QuestionPage />} />
                   </Route>
                   {/* Routes accessed only if user is authenticated */}
-                  {/* <Route element={<AdminRoutesWrapper />}> */}
                   <Route element={<ProtectedRoutesWrapper />}>
-                    {/* <Route path="/users" element={<AdminDashboardPage />} /> */}
+                    <Route
+                      path="/admin-dashboard"
+                      element={<AdminDashboardPage />}
+                    />
+                    <Route path="/users" element={<AdminDashboardPage />} />
+                    <Route path="/editResource" element={<EditResource />} />
+                    <Route path="/editQuestion" element={<EditQuestion />} />
                   </Route>
 
-                  {/* Route which redirects to a different page depending on if the user is an authenticated or not by utilizing the DynamicRedirect component */}
-                  <Route
-                    path="/admin-dashboard"
-                    element={<AdminDashboardPage />}
-                  />
                   {/* Route which redirects to a different page depending on if the user is an authenticated or not by utilizing the DynamicRedirect component */}
                   <Route
                     path="/"
@@ -89,9 +86,7 @@ function App() {
                       />
                     }
                   />
-                  <Route path="/home" element={<HomePage />} />
                   <Route path="/about" element={<AboutThisProjectPage />} />
-                  <Route path="/question" element={<QuestionPage />} />
 
                   {/* Route which is accessed if no other route is matched */}
                   <Route path="*" element={<NotFoundPage />} />
diff --git a/client/src/Authentication/LoginPage.tsx b/client/src/Authentication/LoginPage.tsx
index c930499b..9ac7af28 100644
--- a/client/src/Authentication/LoginPage.tsx
+++ b/client/src/Authentication/LoginPage.tsx
@@ -134,7 +134,7 @@ function LoginPage() {
         <FormCol>
           <Grid item container justifyContent="center">
             <Typography variant="h2" textAlign="center">
-              Log In
+              Administrator Log In
             </Typography>
           </Grid>
           <Grid item width="1">
@@ -177,11 +177,11 @@ function LoginPage() {
                 Forgot password?
               </Link>
             </Grid>
-            <Grid item>
+            {/* <Grid item>
               <Link component={RouterLink} to="/register">
                 Sign up
               </Link>
-            </Grid>
+            </Grid> */}
           </FormRow>
         </FormCol>
       </FormGrid>
diff --git a/client/src/Home/AboutThisProjectPage.tsx b/client/src/Home/AboutThisProjectPage.tsx
index 5ecca407..7632c7b5 100644
--- a/client/src/Home/AboutThisProjectPage.tsx
+++ b/client/src/Home/AboutThisProjectPage.tsx
@@ -21,14 +21,14 @@ function AboutThisProjectPage() {
         direction="row"
         justifyContent="space-between"
         alignItems="flex-start"
-        height="100%"
+        height="100vh"
         fit-content="100%"
       >
         <Grid item width="100%">
           <NavBar />
         </Grid>
 
-        <Grid item width="100%" padding={2} justifyContent="flex-start">
+        <Grid item width="100%" justifyContent="flex-start">
           <Typography variant="h3" fontWeight="bold" textAlign="center">
             Guide to Interpersonal Resources at Penn
           </Typography>
@@ -130,7 +130,15 @@ function AboutThisProjectPage() {
             </Box>
           </Grid>
         </Grid>
-        <Grid item width="100%" alignItems="flex-end" padding={0} spacing={0}>
+        <Grid
+          item
+          width="100%"
+          alignItems="flex-end"
+          padding={0}
+          spacing={0}
+          position="fixed"
+          bottom={0}
+        >
           <Footer />
         </Grid>
       </Grid>
diff --git a/client/src/Question/QuestionPage.tsx b/client/src/Question/QuestionPage.tsx
index 8a390ed8..e1ace298 100644
--- a/client/src/Question/QuestionPage.tsx
+++ b/client/src/Question/QuestionPage.tsx
@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import React, { useEffect, useState } from 'react';
-import { Box } from '@mui/material';
+import { Box, CircularProgress } from '@mui/material';
 import ScreenGrid from '../components/ScreenGrid';
 import QuestionComponent from './QuestionComponent';
 import ResourceComponent from './ResourceComponent';
@@ -10,7 +10,6 @@ import SidebarComponent from '../components/sidebar/SidebarComponent';
 import BackButton from './Components/BackButton';
 import NextButton from './Components/NextButton';
 import StartOverButton from './Components/StartOverButton';
-import PopupWarning from '../components/PopupWarning';
 
 /**
  * This page is the source of truth for all the state driven interactions of the question system.
@@ -21,18 +20,9 @@ import PopupWarning from '../components/PopupWarning';
  * It also stores an array of "allQuestions" which will be used to handle to "back" functionality
  */
 function QuestionPage() {
-  const initialQuestion = '637ea16cf9860ef25c72e639';
-  const [currentQuestion, setCurrentQuestion] = useState({
-    _id: 'Placeholder',
-    text: '',
-    isQuestion: true,
-    resultantAnswers: [],
-  } as IQuestion);
-
-  // const allQuestions: string[] = [initialQuestion];
+  const [currentQuestion, setCurrentQuestion] = useState({} as IQuestion);
   const [questionIndex, setQuestionIndex] = useState(0);
-  const [allQuestions, setAllQuestions] = useState<string[]>([initialQuestion]);
-  // const [allAnswers, setAllAnswers] = useState<string[]>([]);
+  const [allQuestions, setAllQuestions] = useState<string[]>([]);
 
   // Helper functions
   const appendQuestion = (value: string) => {
@@ -109,10 +99,11 @@ function QuestionPage() {
   };
 
   useEffect(() => {
-    if (initialQuestion != null) {
-      getNextFromID(initialQuestion);
+    if (allQuestions.length === 0) {
+      getNextFromID('1');
+      appendQuestion('1');
     }
-  }, [initialQuestion]);
+  }, [allQuestions]);
 
   let leftButton = <div />;
   if (questionIndex !== 0) {
@@ -132,6 +123,14 @@ function QuestionPage() {
     rightButton = <StartOverButton />;
   }
 
+  if (!currentQuestion.text) {
+    return (
+      <ScreenGrid>
+        <CircularProgress />
+      </ScreenGrid>
+    );
+  }
+
   if (currentQuestion.isQuestion) {
     return (
       <ScreenGrid>
@@ -163,7 +162,6 @@ function QuestionPage() {
       {rightButton}
     </ScreenGrid>
   );
-  // }
 }
 
 export default QuestionPage;
diff --git a/client/src/Question/ResourceComponent.tsx b/client/src/Question/ResourceComponent.tsx
index 4c4c0ed7..3aa55d6b 100644
--- a/client/src/Question/ResourceComponent.tsx
+++ b/client/src/Question/ResourceComponent.tsx
@@ -38,11 +38,13 @@ function ResourceComponent(props: ResourceComponentProps) {
             </Typography>
           </Grid>
           {question.resultantAnswers.map((answer) => {
+            console.log(answer.resourceContent);
             return (
               <Grid item margin="auto" marginTop="1%">
                 <ResourceDropdown
                   title={answer.text}
                   content={answer.resourceContent}
+                  link={answer.resourceLink}
                 />
               </Grid>
             );
diff --git a/client/src/Question/ResourcePage.tsx b/client/src/Question/ResourcePage.tsx
deleted file mode 100644
index ea501c14..00000000
--- a/client/src/Question/ResourcePage.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Typography } from '@mui/material';
-import ScreenGrid from '../components/ScreenGrid';
-import QuestionComponent from './QuestionComponent';
-// import ResourceComponent from './ResourceComponent';
-import { IQuestion } from '../util/types/question';
-import { IAnswer } from '../util/types/answer';
-import { IResource } from '../util/types/resource';
-import { getData, useData } from '../util/api';
-
-function ResourcePage() {
-  return (
-    <ScreenGrid>
-      <div>
-        <Typography>hello</Typography>
-      </div>
-    </ScreenGrid>
-  );
-}
-
-export default ResourcePage;
diff --git a/client/src/components/Footer.tsx b/client/src/components/Footer.tsx
index d1218b84..a5aefd43 100644
--- a/client/src/components/Footer.tsx
+++ b/client/src/components/Footer.tsx
@@ -3,6 +3,8 @@ import { Box, Button, Stack } from '@mui/material';
 import ArrowForward from '@mui/icons-material/ArrowForward';
 
 export default function Footer() {
+  const params = window.location.pathname;
+  const isAbout = params === '/about';
   return (
     <div>
       <Stack
@@ -21,14 +23,13 @@ export default function Footer() {
           alt="Penn Logo"
           src="https://upload.wikimedia.org/wikipedia/commons/thumb/7/7c/Shield_of_the_University_of_Pennsylvania.svg/1200px-Shield_of_the_University_of_Pennsylvania.svg.png"
         />
-
         <Button
           color="primary"
           size="medium"
           endIcon={<ArrowForward />}
-          href="/about"
+          href={isAbout ? '/question' : '/about'}
         >
-          About This Project
+          {isAbout ? 'Ask a Question' : 'About This Project'}
         </Button>
       </Stack>
     </div>
diff --git a/client/src/components/ResourceDropdown.tsx b/client/src/components/ResourceDropdown.tsx
index 53f9cb80..e69648af 100644
--- a/client/src/components/ResourceDropdown.tsx
+++ b/client/src/components/ResourceDropdown.tsx
@@ -3,7 +3,6 @@ import { useState } from 'react';
 import Card from '@mui/material/Card';
 import CardHeader from '@mui/material/CardHeader';
 import CardContent from '@mui/material/CardContent';
-import Container from '@mui/material/Container';
 import IconButton from '@mui/material/IconButton';
 import Collapse from '@mui/material/Collapse';
 import KeyboardArrowDownIcon from '@mui/icons-material/KeyboardArrowDown';
@@ -13,12 +12,13 @@ import HTMLMapper from './HTMLMapper';
 
 interface ResourceDropdownProps {
   title: string;
-  content: string;
+  content: string | undefined;
+  link: string | undefined;
 }
 
 export default function ResourceDropdown(props: ResourceDropdownProps) {
   const [open, setOpen] = useState(false);
-  const { title, content } = props;
+  const { title, content, link } = props;
   return (
     <Card
       sx={{
@@ -47,13 +47,30 @@ export default function ResourceDropdown(props: ResourceDropdownProps) {
         <Collapse in={open} timeout="auto" unmountOnExit>
           <CardContent>
             <Typography>
-              <HTMLMapper text={content} />
+              {content ? <HTMLMapper text={content} /> : ''}
             </Typography>
-            <Grid container justifyContent="flex-end">
-              <Button variant="text" size="medium">
-                Learn More
-              </Button>
-            </Grid>
+            {link ? (
+              <Grid container justifyContent="flex-end">
+                <Button
+                  variant="text"
+                  size="medium"
+                  onClick={() => {
+                    const newWindow = window.open(
+                      link,
+                      '_blank',
+                      'noopener,noreferrer',
+                    );
+                    if (newWindow) {
+                      newWindow.opener = null;
+                    }
+                  }}
+                >
+                  Learn More
+                </Button>
+              </Grid>
+            ) : (
+              <div />
+            )}
           </CardContent>
         </Collapse>
       </div>
diff --git a/client/src/components/sidebar/SidebarContent.tsx b/client/src/components/sidebar/SidebarContent.tsx
index b0c5a3b5..be3cd9d3 100644
--- a/client/src/components/sidebar/SidebarContent.tsx
+++ b/client/src/components/sidebar/SidebarContent.tsx
@@ -41,6 +41,9 @@ export default function SidebarContent(props: SidebarProps) {
     <div>
       <Toolbar />
       <List>
+        <ListItem>
+          <h1>Definitions</h1>
+        </ListItem>
         {definitions.map((definition) => (
           <ListItem>
             <SidebarContentItem
diff --git a/client/src/util/types/answer.ts b/client/src/util/types/answer.ts
index 7c1fe0a0..03d5acfa 100644
--- a/client/src/util/types/answer.ts
+++ b/client/src/util/types/answer.ts
@@ -5,6 +5,7 @@
 export interface IAnswer {
   _id: string;
   text: string;
-  resourceContent: string;
-  resultantQuestionId: string;
+  resourceLink: string | undefined;
+  resourceContent: string | undefined;
+  resultantQuestionId: string | undefined;
 }
diff --git a/server/src/controllers/admin.controller.ts b/server/src/controllers/admin.controller.ts
index 5cf637e8..2cdf5b5c 100644
--- a/server/src/controllers/admin.controller.ts
+++ b/server/src/controllers/admin.controller.ts
@@ -136,8 +136,7 @@ const getAllQuestions = async (
 };
 
 /**
- * Upgrade a user to an admin. The email of the user is expected to be in the request body.
- * Upon success, return 200 OK status code.
+ * Edits the text of a question in the database. The new text is expected to be in the request body.
  */
 const editQuestionText = async (
   req: express.Request,
diff --git a/server/src/controllers/question.controller.ts b/server/src/controllers/question.controller.ts
index 3c50389f..e9db3de2 100644
--- a/server/src/controllers/question.controller.ts
+++ b/server/src/controllers/question.controller.ts
@@ -12,14 +12,15 @@ const getNextQuestion = async (
   next: express.NextFunction,
 ) => {
   const { answerID } = req.params;
+  const id = parseInt(answerID, 10);
   return (
-    getNextQuestionFromDB(answerID)
+    getNextQuestionFromDB(id)
       .then((nextQuestion) => {
         res.status(StatusCode.OK).send(nextQuestion);
-        // console.log('Next question', nextQuestion);
       })
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       .catch((e) => {
+        console.log(e);
         next(ApiError.internal('Unable to retrieve next question'));
       })
   );
@@ -31,14 +32,16 @@ const getQuestionWithID = async (
   next: express.NextFunction,
 ) => {
   const { questionID } = req.params;
+  const id = parseInt(questionID, 10);
   return (
-    getQuestionById(questionID)
+    getQuestionById(id)
       .then((nextQuestion) => {
         // console.log(nextQuestion);
         res.status(StatusCode.OK).send(nextQuestion);
       })
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
       .catch((e) => {
+        console.log(e);
         next(ApiError.internal('Unable to retrieve next question'));
       })
   );
diff --git a/server/src/controllers/resource.controller.ts b/server/src/controllers/resource.controller.ts
deleted file mode 100644
index 50f72aba..00000000
--- a/server/src/controllers/resource.controller.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import express from 'express';
-import StatusCode from '../util/statusCode';
-import ApiError from '../util/apiError';
-import getResourceFromDB from '../services/resource.service';
-
-const getResource = async (
-  req: express.Request,
-  res: express.Response,
-  next: express.NextFunction,
-) => {
-  const { answerID } = req.params;
-  return (
-    getResourceFromDB(answerID)
-      .then((resource) => {
-        res.status(StatusCode.OK).send(resource);
-      })
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      .catch((e) => {
-        next(ApiError.internal('Unable to retrieve next question'));
-      })
-  );
-};
-
-export default getResource;
diff --git a/server/src/models/answer.model.ts b/server/src/models/answer.model.ts
index 979d7e37..a4324d25 100644
--- a/server/src/models/answer.model.ts
+++ b/server/src/models/answer.model.ts
@@ -9,25 +9,34 @@
 import mongoose from 'mongoose';
 
 const AnswerSchema = new mongoose.Schema({
+  _id: {
+    type: Number,
+    required: true,
+  },
   text: {
     type: String,
     required: true,
   },
   resultantQuestionId: {
-    type: String,
-    required: true,
+    type: Number,
+    required: false,
   },
   resourceContent: {
     type: String,
-    required: true,
+    required: false,
+  },
+  resourceLink: {
+    type: String,
+    required: false,
   },
 });
 
 interface IAnswer extends mongoose.Document {
-  _id: string;
+  _id: number;
   text: string;
   resourceContent: string;
-  resultantQuestionId: string;
+  resultantQuestionId: number;
+  resourceLink: string;
 }
 
 const Answer = mongoose.model<IAnswer>('Answer', AnswerSchema);
diff --git a/server/src/models/definition.model.ts b/server/src/models/definition.model.ts
index 90399104..42fc36af 100644
--- a/server/src/models/definition.model.ts
+++ b/server/src/models/definition.model.ts
@@ -15,7 +15,7 @@ const DefinitionSchema = new mongoose.Schema({
     required: true,
   },
   questionIds: {
-    type: [String],
+    type: [Number],
     required: true,
   },
 });
@@ -24,7 +24,7 @@ interface IDefinition extends mongoose.Document {
   _id: string;
   word: string;
   definition: string;
-  questionIds: string[];
+  questionIds: number[];
 }
 
 const Definition = mongoose.model<IDefinition>('Definition', DefinitionSchema);
diff --git a/server/src/models/question.model.ts b/server/src/models/question.model.ts
index 93355b14..a905d373 100644
--- a/server/src/models/question.model.ts
+++ b/server/src/models/question.model.ts
@@ -3,13 +3,35 @@
  * access the model in TypeScript.
  */
 
-import { IAnswer } from './answer.model';
+import mongoose from 'mongoose';
+import { Answer, IAnswer } from './answer.model';
+
+const QuestionSchema = new mongoose.Schema({
+  _id: {
+    type: Number,
+    required: true,
+  },
+  text: {
+    type: String,
+    required: true,
+  },
+  resultantAnswers: {
+    type: [Answer.schema],
+    required: true,
+  },
+  isQuestion: {
+    type: Boolean,
+    required: true,
+  },
+});
 
 interface IQuestion {
-  _id: string;
+  _id: number;
   text: string;
   resultantAnswers: [IAnswer];
   isQuestion: boolean;
 }
 
-export default IQuestion;
+const Question = mongoose.model<IQuestion>('Question', QuestionSchema);
+
+export { IQuestion, Question };
diff --git a/server/src/models/resource.model.ts b/server/src/models/resource.model.ts
deleted file mode 100644
index d4934f1a..00000000
--- a/server/src/models/resource.model.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Defines the resource model for the database and also the interface to
- * access the model in TypeScript.
- */
-
-import mongoose from 'mongoose';
-
-const ResourceSchema = new mongoose.Schema({
-  title: {
-    type: String,
-    required: true,
-  },
-  content: {
-    type: String,
-    required: true,
-  },
-});
-
-interface IResource extends mongoose.Document {
-  _id: string;
-  title: string;
-  content: string;
-}
-
-const Resource = mongoose.model<IResource>('Resource', ResourceSchema);
-
-export { IResource, Resource };
diff --git a/server/src/models/temp-question.model.ts b/server/src/models/temp-question.model.ts
deleted file mode 100644
index b21ec6bd..00000000
--- a/server/src/models/temp-question.model.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Defines a temporary "intermediate" question model for the database and also the interface to
- * access the model in TypeScript.
- */
-
-import mongoose from 'mongoose';
-
-const TempQuestionSchema = new mongoose.Schema({
-  text: {
-    type: String,
-    required: true,
-  },
-  resultantAnswerIds: {
-    type: [String],
-    required: true,
-  },
-  isQuestion: {
-    type: Boolean,
-    required: true,
-  },
-});
-
-interface ITempQuestion extends mongoose.Document {
-  _id: string;
-  text: string;
-  resultantAnswerIds: string[];
-  isQuestion: boolean;
-}
-
-const TempQuestion = mongoose.model<ITempQuestion>(
-  'Question',
-  TempQuestionSchema,
-);
-
-export { ITempQuestion, TempQuestion };
diff --git a/server/src/routes/resource.route.ts b/server/src/routes/resource.route.ts
deleted file mode 100644
index 43f080e3..00000000
--- a/server/src/routes/resource.route.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import express from 'express';
-import getResource from '../controllers/resource.controller';
-import 'dotenv/config';
-
-const router = express.Router();
-
-router.get('/get-resource/:answerID', getResource);
-
-export default router;
diff --git a/server/src/routes/routers.ts b/server/src/routes/routers.ts
index 5a9e218e..43efb474 100644
--- a/server/src/routes/routers.ts
+++ b/server/src/routes/routers.ts
@@ -10,7 +10,6 @@ import { Router } from 'express';
 import adminRouter from './admin.route';
 import authRouter from './auth.route';
 import questionRouter from './question.route';
-import resourceRouter from './resource.route';
 import definitionRouter from './definition.route';
 
 const prefixToRouterMap: { prefix: string; router: Router }[] = [
@@ -26,10 +25,6 @@ const prefixToRouterMap: { prefix: string; router: Router }[] = [
     prefix: '/api/question',
     router: questionRouter,
   },
-  {
-    prefix: '/api/resource',
-    router: resourceRouter,
-  },
   {
     prefix: '/api/definition',
     router: definitionRouter,
diff --git a/server/src/services/definition.service.ts b/server/src/services/definition.service.ts
index facf9660..c6b4192a 100644
--- a/server/src/services/definition.service.ts
+++ b/server/src/services/definition.service.ts
@@ -2,7 +2,11 @@ import { Definition } from '../models/definition.model';
 
 const getDefinitionsForQuestionFromDB = async (questionID: string) => {
   console.log(questionID);
-  const definitions = await Definition.find({ questionIds: questionID }).exec();
+  const id = parseInt(questionID, 10);
+  const definitions = await Definition.find({ questionIds: id }).exec();
+  if (!definitions) {
+    return [];
+  }
   console.log(definitions);
   return definitions;
 };
diff --git a/server/src/services/question.service.ts b/server/src/services/question.service.ts
index e339a0e8..7848cecd 100644
--- a/server/src/services/question.service.ts
+++ b/server/src/services/question.service.ts
@@ -3,93 +3,40 @@
  */
 // import { hash } from 'bcrypt';
 import { Answer, IAnswer } from '../models/answer.model';
-import IQuestion from '../models/question.model';
-import { TempQuestion, ITempQuestion } from '../models/temp-question.model';
-
-async function getAnswerObj(ansId: string) {
-  const resultantAnswer = await Answer.findById(ansId);
-  const answerObj = {
-    _id: resultantAnswer?._id,
-    text: resultantAnswer?.text,
-    resourceContent: resultantAnswer?.resourceContent,
-    resultantQuestionId: resultantAnswer?.resultantQuestionId,
-  } as IAnswer;
-  return answerObj;
-}
-
-const convertTempToQuestion = async (tempQuestion: ITempQuestion) => {
-  const answerArray: IAnswer[] = [];
-  if (tempQuestion != null) {
-    await Promise.all(
-      tempQuestion?.resultantAnswerIds.map(async (id) =>
-        getAnswerObj(id).then((newAnswer) => answerArray.push(newAnswer)),
-      ),
-    );
-  }
-
-  const question = {
-    _id: tempQuestion?._id,
-    text: tempQuestion?.text,
-    resultantAnswers: answerArray,
-    isQuestion: tempQuestion?.isQuestion,
-  } as IQuestion;
-
-  return question;
-};
-
-const convertQuestionToTemp = (question: IQuestion) => {
-  const answerIdArray: string[] = [];
-  question.resultantAnswers.forEach((answer) => {
-    answerIdArray.push(answer._id);
-  });
-  const tempQuestion = {
-    _id: question._id,
-    text: question.text,
-    resultantAnswerIds: answerIdArray,
-    isQuestion: question.isQuestion,
-  } as ITempQuestion;
-
-  return tempQuestion;
-};
-
-const getNextQuestionFromDB = async (answerID: string) => {
-  const answer = await Answer.findById(answerID).exec();
-  const tempQuestion = await TempQuestion.findById(
-    answer?.resultantQuestionId,
-  ).exec();
-
-  if (tempQuestion != null) {
-    return convertTempToQuestion(tempQuestion!);
-  }
-  return null;
-};
+import { IQuestion, Question } from '../models/question.model';
+
+// async function getAnswerObj(ansId: string) {
+//   const resultantAnswer = await Answer.findById(ansId);
+//   const answerObj = {
+//     _id: resultantAnswer?._id,
+//     text: resultantAnswer?.text,
+//     resourceContent: resultantAnswer?.resourceContent,
+//     resultantQuestionId: resultantAnswer?.resultantQuestionId,
+//   } as IAnswer;
+//   return answerObj;
+// }
 
 /**
- * Get's a question from it's ID
+ * Get's a question from its ID
  * @param questID the id of the desired question
  * @returns the question with the given ID or null
  */
-const getQuestionById = async (questID: string) => {
-  const tempQuestion = await TempQuestion.findById(questID).exec();
-  if (tempQuestion != null) {
-    return convertTempToQuestion(tempQuestion!);
+const getQuestionById = async (questID: number) => {
+  const question = await Question.findById(questID).exec();
+  if (!question) {
+    throw new Error('Question not found');
   }
-  return null;
+  return question;
 };
 
-// const passwordHashSaltRounds = 10;
-//  const removeSensitiveDataQuery = [
-//    '-password',
-//    '-verificationToken',
-//    '-resetPasswordToken',
-//    '-resetPasswordTokenExpiryDate',
-//  ];
-
-//  const removeSensitiveDataQueryKeepPassword = [
-//    '-verificationToken',
-//    '-resetPasswordToken',
-//    '-resetPasswordTokenExpiryDate',
-//  ];
+const getNextQuestionFromDB = async (answerID: number) => {
+  const answer = await Answer.findById(answerID).exec();
+  if (!answer) {
+    throw new Error('Answer not found');
+  }
+  const question = await getQuestionById(answer.resultantQuestionId);
+  return question;
+};
 
 /**
  * Creates a new question in the database.
@@ -104,73 +51,27 @@ const createQuestion = async (
   isQuestion: boolean,
 ) => {
   const newQuestion = {
-    _id,
+    _id: parseInt(_id, 10),
     text,
     resultantAnswers,
     isQuestion,
   } as IQuestion;
-  const newTempQuestion = convertQuestionToTemp(newQuestion);
-
-  const user = await newTempQuestion.save();
-  return user;
+  const q = await Question.create(newQuestion);
+  if (!q) {
+    throw new Error('Question not created');
+  }
+  return q;
 };
 
-/**
- * Gets a user from the database by their email but doesn't include the
- * password in the returned user.
- * @param email The email of the user to get
- * @returns The {@link User} or null if the user was not found.
- */
-//  const getUserByEmail = async (email: string) => {
-//    const user = await Question.findOne({ email })
-//      .select(removeSensitiveDataQuery)
-//      .exec();
-//    return user;
-//  };
-
-//  /**
-//   * Gets a user from the database by their email and includes the password in
-//   * the returned user.
-//   * @param email The email of the user to get
-//   * @returns The {@link User} or null if the user was not found.
-//   */
-//  const getUserByEmailWithPassword = async (email: string) => {
-//    const user = await User.findOne({ email })
-//      .select(removeSensitiveDataQueryKeepPassword)
-//      .exec();
-//    return user;
-//  };
-
-//  /**
-//   * Gets a user from the database by their verification token but doesn't include
-//   * the password in the returned user.
-//   * @param verificationToken The {@link string} representing the verification token
-//   * @returns The {@link User} or null if the user was not found.
-//   */
-//  const getUserByVerificationToken = async (verificationToken: string) => {
-//    const user = await User.findOne({ verificationToken })
-//      .select(removeSensitiveDataQuery)
-//      .exec();
-//    return user;
-//  };
-
 /**
  * @returns All the {@link IQuestion}s in the database.
  */
 const getAllQuestionsFromDB = async () => {
-  const tempQuestionList = await TempQuestion.find({}).exec(); // .select(removeSensitiveDataQuery).exec();
-  const questionArray: IQuestion[] = [];
-  if (tempQuestionList != null) {
-    await Promise.all(
-      tempQuestionList?.map(async (tempQuestion) =>
-        convertTempToQuestion(tempQuestion).then((newQuestion) =>
-          questionArray.push(newQuestion),
-        ),
-      ),
-    );
-    return questionArray;
+  const questionList = await Question.find({}).exec();
+  if (!questionList) {
+    throw new Error('Questions not found');
   }
-  return null;
+  return questionList;
 };
 
 //  /**
@@ -181,8 +82,7 @@ const getAllQuestionsFromDB = async () => {
 
 const editQuestion = async (question: IQuestion) => {
   const qID = question._id;
-  const tempQuestion: ITempQuestion = convertQuestionToTemp(question);
-  await TempQuestion.replaceOne({ _id: qID }, tempQuestion).exec();
+  await Question.replaceOne({ _id: qID }, question).exec();
   // save answers too
   if (question.resultantAnswers != null) {
     question.resultantAnswers.forEach(async (answer: IAnswer) => {
@@ -195,7 +95,7 @@ const deleteResource = async (question: IQuestion, resource: IAnswer) => {
   const qID = question._id;
   const rID = resource._id;
   // removes resource with id rID from question with id qID
-  await TempQuestion.findByIdAndUpdate(
+  await Question.findByIdAndUpdate(
     { _id: qID },
     { $pull: { resultantAnswerIds: rID } },
   ).exec();
@@ -204,27 +104,12 @@ const deleteResource = async (question: IQuestion, resource: IAnswer) => {
 const deleteQuestion = async (question: IQuestion) => {
   const qID = question._id;
   // removes question from question db
-  await TempQuestion.findByIdAndDelete(qID).exec();
+  await Question.findByIdAndDelete(qID).exec();
 };
 
-//  /**
-//   * A function that deletes a user from the database.
-//   * @param id The id of the user to delete.
-//   * @returns The deleted {@link User}
-//   */
-//  const deleteUserById = async (id: string) => {
-//    const user = await User.findByIdAndDelete(id).exec();
-//    return user;
-//  };
-
 export {
-  //    passwordHashSaltRounds,
   createQuestion,
-  //    getUserByEmail,
-  //    getUserByVerificationToken,
   getQuestionById,
-  //    getUserByEmailWithPassword,
-  //    getUserByResetPasswordToken,
   getAllQuestionsFromDB,
   editQuestion,
   getNextQuestionFromDB,
diff --git a/server/src/services/resource.service.ts b/server/src/services/resource.service.ts
deleted file mode 100644
index 9dff3f5c..00000000
--- a/server/src/services/resource.service.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * All the functions for interacting with user data in the MongoDB database
- */
-// import { hash } from 'bcrypt';
-// import { Answer, IAnswer } from '../models/answer.model';
-// import { IQuestion, Question } from '../models/question.model';
-// import { TempQuestion } from '../models/temp-question.model';
-import { Resource } from '../models/resource.model';
-
-// async function getAnswerObj(ansId: string) {
-//   const resultantAnswer = await Answer.findById(ansId);
-//   const answerObj = {
-//     _id: resultantAnswer?._id,
-//     text: resultantAnswer?.text,
-//     resultantQuestionId: resultantAnswer?.resultantQuestionId,
-//   } as IAnswer;
-//   return answerObj;
-// }
-
-const getResourceFromDB = async (answerID: string) => {
-  const resource = await Resource.findById(answerID).exec();
-
-  return resource;
-};
-
-export default getResourceFromDB;