diff --git a/amplify/auth/PostConfirmation/handler.ts b/amplify/auth/PostConfirmation/handler.ts
index 702bd92f..000352d9 100644
--- a/amplify/auth/PostConfirmation/handler.ts
+++ b/amplify/auth/PostConfirmation/handler.ts
@@ -57,7 +57,6 @@ export const handler: PostConfirmationTriggerHandler = async (event) => {
     role: "Participant",
     id: event.request.userAttributes.sub,
     email: event.request.userAttributes.email,
-    checkedIn: false,
     willEatMeals: false,
     allergies: "",
     institution: "",
diff --git a/amplify/data/resource.ts b/amplify/data/resource.ts
index 0f6bc665..3f5f2a0b 100644
--- a/amplify/data/resource.ts
+++ b/amplify/data/resource.ts
@@ -34,13 +34,6 @@ const schema = a
         completedRegistration: a.boolean(),
         allergies: a.string(),
         willEatMeals: a.boolean(),
-        checkedIn: a
-          .boolean()
-          .default(false)
-          .authorization((allow) => [
-            allow.ownerDefinedIn("profileOwner").to(["read"]),
-            allow.groups(["Admin"]).to(["read", "update", "delete", "create"]),
-          ]),
         teamId: a
           .id()
           .authorization((allow) => [
@@ -94,6 +87,12 @@ const schema = a
         members: a.hasMany("User", "teamId"),
         scores: a.hasMany("Score", "teamId"),
         teamRooms: a.hasMany("TeamRoom", "teamId"),
+        devPostLink: a
+          .string()
+          .authorization((allow) => [
+            allow.groups(["Admin"]).to(["read", "update"]),
+            allow.authenticated().to(["read", "update"]),
+          ]),
       })
       .authorization((allow) => [
         allow.group("Admin").to(["read", "update", "create", "delete"]),
@@ -279,21 +278,6 @@ const schema = a
       .authorization((allow) => [allow.group("Admin")])
       .handler(a.handler.function(ResetHackathon))
       .returns(a.ref("StatusCodeFunctionResponse")),
-
-    // Custom resolvers
-    SetUserAsCheckedIn: a
-      .mutation()
-      .arguments({
-        userId: a.string().required(),
-      })
-      .returns(a.ref("User"))
-      .authorization((allow) => [allow.authenticated()])
-      .handler(
-        a.handler.custom({
-          dataSource: a.ref("User"),
-          entry: "./user/SetUserAsCheckedIn.js",
-        }),
-      ),
   })
 
   .authorization((allow) => [
diff --git a/amplify/data/user/SetUserAsCheckedIn.js b/amplify/data/user/SetUserAsCheckedIn.js
deleted file mode 100644
index e1b46d2c..00000000
--- a/amplify/data/user/SetUserAsCheckedIn.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export function request(ctx) {
-  return {
-    operation: "UpdateItem",
-    key: util.dynamodb.toMapValues({ id: ctx.args.userId }),
-    update: {
-      expression: "SET checkedIn = :checkedIn",
-      expressionValues: { ":checkedIn": { BOOL: true } },
-    },
-  };
-}
-
-export function response(ctx) {
-  return ctx.result;
-}
diff --git a/amplify/function/BusinessLogic/CreateTeamWithCode/handler.ts b/amplify/function/BusinessLogic/CreateTeamWithCode/handler.ts
index 75c916bd..a372588c 100644
--- a/amplify/function/BusinessLogic/CreateTeamWithCode/handler.ts
+++ b/amplify/function/BusinessLogic/CreateTeamWithCode/handler.ts
@@ -2,6 +2,7 @@ import { Amplify } from "aws-amplify";
 import { generateClient } from "aws-amplify/data";
 import type { AppSyncIdentityCognito } from "aws-lambda";
 import type { Schema } from "../../../data/resource";
+import { tryCatch } from "../utils/try-catch";
 import { createTeam, updateUser } from "./graphql/mutations";
 import { getTeam } from "./graphql/queries";
 
@@ -37,101 +38,106 @@ const client = generateClient<Schema>({
   authMode: "iam",
 });
 
+const createNewTeam = (teamName: string, teamId: string) =>
+  client.graphql({
+    query: createTeam,
+    variables: {
+      input: {
+        name: teamName,
+        id: teamId,
+      },
+    },
+  });
+const updateUserTeam = (id: string, teamId: string) =>
+  client.graphql({
+    query: updateUser,
+    variables: {
+      input: {
+        id,
+        teamId,
+      },
+    },
+  });
+const generateTeamId = () =>
+  Array.from(Array(4), () =>
+    Math.floor(Math.random() * 36)
+      .toString(36)
+      .toUpperCase(),
+  ).join("");
+const getTeamFromId = (teamId: string) =>
+  client.graphql({
+    query: getTeam,
+    variables: {
+      id: teamId,
+    },
+  });
 export const handler: Schema["CreateTeamWithCode"]["functionHandler"] = async (
   event,
 ) => {
-  let team = null;
-  let teamId: string | null = null;
-  try {
-    do {
-      teamId = Array.from(Array(4), () =>
-        Math.floor(Math.random() * 36)
-          .toString(36)
-          .toUpperCase(),
-      ).join("");
+  const {
+    arguments: { addCallerToTeam, teamName },
+  } = event;
 
-      team = (
-        await client.graphql({
-          query: getTeam,
-          variables: {
-            id: teamId,
-          },
-        })
-      ).data.getTeam;
-    } while (team != null);
+  let teamId = generateTeamId();
+  let { error: teamIdTaken } = await tryCatch(getTeamFromId(teamId));
+  let attempts = 0;
+  const MAX_ATTEMPTS = 100; // Define a maximum number of attempts
 
-    const teamCreation = await client
-      .graphql({
-        query: createTeam,
-        variables: {
-          input: {
-            name: event.arguments.teamName,
-            id: teamId,
-          },
-        },
-      })
-      .catch(() => {
-        throw new Error(
-          JSON.stringify({
-            body: { value: `Error creating team` },
-            statusCode: 500,
-            headers: { "Content-Type": "application/json" },
-          }),
-        );
-      });
+  while (teamIdTaken && attempts < MAX_ATTEMPTS) {
+    teamId = generateTeamId();
+    ({ error: teamIdTaken } = await tryCatch(getTeamFromId(teamId)));
+    attempts++;
+  }
 
-    if (teamCreation) {
-      if (event.arguments.addCallerToTeam) {
-        return await client
-          .graphql({
-            query: updateUser,
-            variables: {
-              input: {
-                id: (event.identity as AppSyncIdentityCognito).sub,
-                teamId: teamId,
-              },
-            },
-          })
-          .then(() => {
-            return {
-              body: { value: teamId },
-              statusCode: 200,
-              headers: { "Content-Type": "application/json" },
-            };
-          })
-          .catch(() => {
-            throw new Error(
-              JSON.stringify({
-                body: { value: `Error updating user (team was created)` },
-                statusCode: 500,
-                headers: { "Content-Type": "application/json" },
-              }),
-            );
-          });
-      } else {
-        return {
-          body: { value: teamId },
-          statusCode: 200,
-          headers: { "Content-Type": "application/json" },
-        };
-      }
-    } else {
-      throw new Error(
-        JSON.stringify({
-          body: { value: `Error creating team` },
-          statusCode: 500,
-          headers: { "Content-Type": "application/json" },
-        }),
-      );
-    }
-  } catch (error) {
-    console.error(error);
+  if (teamIdTaken) {
+    // Handle the case where a unique team ID could not be generated
+    throw new Error(
+      JSON.stringify({
+        body: {
+          value: `Failed to generate a unique team ID after ${MAX_ATTEMPTS} attempts.`,
+        },
+        statusCode: 500,
+        headers: { "Content-Type": "application/json" },
+      }),
+    );
+  }
+  const { error: createTeamError } = await tryCatch(
+    createNewTeam(teamName, teamId),
+  );
+  if (createTeamError) {
     throw new Error(
       JSON.stringify({
-        body: { value: `Unhandled Internal Server Error` },
+        body: { value: `Error creating team` },
         statusCode: 500,
         headers: { "Content-Type": "application/json" },
       }),
     );
   }
+  if (!addCallerToTeam) {
+    return {
+      body: { value: teamId },
+      statusCode: 200,
+      headers: { "Content-Type": "application/json" },
+    };
+  }
+  const { error: updateUserError, data: updateUserSuccess } = await tryCatch(
+    updateUserTeam((event.identity as AppSyncIdentityCognito).sub, teamId),
+  );
+  if (updateUserSuccess) {
+    return {
+      body: { value: teamId },
+      statusCode: 200,
+      headers: { "Content-Type": "application/json" },
+    };
+  }
+
+  throw new Error(
+    JSON.stringify({
+      body: {
+        value: `Error updating user ( ${(event.identity as AppSyncIdentityCognito).sub}) (team was created) ${updateUserError}`,
+      },
+      statusCode: 500,
+      headers: { "Content-Type": "application/json" },
+    }),
+  );
 };
diff --git a/amplify/function/BusinessLogic/utils/try-catch.ts b/amplify/function/BusinessLogic/utils/try-catch.ts
new file mode 100644
index 00000000..6d5f46ce
--- /dev/null
+++ b/amplify/function/BusinessLogic/utils/try-catch.ts
@@ -0,0 +1,24 @@
+// Types for the result object with discriminated union
+type Success<T> = {
+  data: T;
+  error: null;
+};
+
+type Failure<E> = {
+  data: null;
+  error: E;
+};
+
+type Result<T, E = Error> = Success<T> | Failure<E>;
+
+// Main wrapper function
+export async function tryCatch<T, E = Error>(
+  promise: Promise<T>,
+): Promise<Result<T, E>> {
+  try {
+    const data = await promise;
+    return { data, error: null };
+  } catch (error) {
+    return { data: null, error: error as E };
+  }
+}
diff --git a/src/app/admin/teams/TeamTableSetup.tsx b/src/app/admin/teams/TeamTableSetup.tsx
index 0e4ff409..88813abf 100644
--- a/src/app/admin/teams/TeamTableSetup.tsx
+++ b/src/app/admin/teams/TeamTableSetup.tsx
@@ -47,14 +47,6 @@ export const teamColumns = [
     filterFn: "includesString",
     sortingFn: "alphanumeric",
   }),
-  columnHelper.accessor("members", {
-    cell: (info) =>
-      info.getValue().every((member) => member.checkedIn)
-        ? "Checked In"
-        : "Not Checked In",
-    header: "Check-in Status",
-    sortingFn: "basic",
-  }),
   columnHelper.accessor("approved", {
     cell: ({
       getValue,
diff --git a/src/app/admin/teams/components/TeamsTablePage.tsx b/src/app/admin/teams/components/TeamsTablePage.tsx
index 9c554cf3..5153b7a2 100644
--- a/src/app/admin/teams/components/TeamsTablePage.tsx
+++ b/src/app/admin/teams/components/TeamsTablePage.tsx
@@ -1,26 +1,20 @@
-import type { Schema } from "@/amplify/data/resource";
 import client from "@/components/_Amplify/AmplifyBackendClient";
 import TeamsTable from "./TeamsTable";
 
-type Members = Pick<
-  Schema["User"]["type"],
-  "id" | "firstName" | "lastName" | "checkedIn"
->;
-export type Team = Pick<Schema["Team"]["type"], "name" | "approved" | "id"> & {
-  members: Members[];
-};
+const getTeams = client.models.Team.list({
+  selectionSet: [
+    "name",
+    "approved",
+    "id",
+    "devPostLink",
+    "members.id",
+    "members.firstName",
+    "members.lastName",
+  ],
+});
+export type Team = Awaited<typeof getTeams>["data"][number];
 export default async function TeamsTablePage() {
-  const { data: teams } = await client.models.Team.list({
-    selectionSet: [
-      "name",
-      "approved",
-      "id",
-      "members.id",
-      "members.firstName",
-      "members.lastName",
-      "members.checkedIn",
-    ],
-  });
+  const { data: teams } = await getTeams;
   if (!teams || !Array.isArray(teams)) return "No teams were found";
   return <TeamsTable teams={teams} />;
 }
diff --git a/src/app/admin/teams/components/ViewButton.tsx b/src/app/admin/teams/components/ViewButton.tsx
index c886583a..d8ae999b 100644
--- a/src/app/admin/teams/components/ViewButton.tsx
+++ b/src/app/admin/teams/components/ViewButton.tsx
@@ -31,9 +31,7 @@ export default function ViewButton({ team }: { team: Team }) {
                   <td className={"rounded-md p-2"}>
                     {`${member.firstName} ${member.lastName}`}
                   </td>
-                  <td className={"rounded-md p-2"}>
-                    {member.checkedIn ? "Checked In" : "Not Checked In"}
-                  </td>
+                  <td className={"rounded-md p-2"}>{member.id}</td>
                 </tr>
               ))}
             </tbody>
diff --git a/src/app/participant/check-in/page.tsx b/src/app/participant/check-in/page.tsx
deleted file mode 100644
index b5d9a139..00000000
--- a/src/app/participant/check-in/page.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-"use client";
-
-import { generateClient } from "aws-amplify/api";
-import Image from "next/image";
-import Link from "next/link";
-import { useEffect, useState } from "react";
-import { type Schema } from "@/amplify/data/resource";
-import { useUser } from "@/components/contexts/UserContext";
-
-const check_mark_icon = "/svgs/checkin/check_mark.svg";
-const cross_icon = "/svgs/checkin/circle_cross.svg";
-
-const CHECKIN_STATUS_TILE_STLYES =
-  "my-20 flex w-4/5 max-w-[1000px] flex-col items-center rounded-xl border-2 border-dark-pink bg-white p-10 shadow-[15px_15px_0px_0px_dark-pink]";
-const CHECKIN_STATUS_HEADER_STYLES = "mb-2 text-2xl font-bold text-dark-pink";
-const CHECKIN_STATUS_TEXT_STYLES =
-  "mb-6 max-w-[450px] text-center text-lg text-black";
-const CHECKIN_STATUS_BUTTON_STYLES =
-  "rounded-xl bg-dark-pink p-4 font-bold hover:bg-pastel-pink";
-
-enum CheckInStatus {
-  Loading = "loading",
-  Error = "error",
-  Success = "success",
-}
-
-const CheckInPage = () => {
-  const client = generateClient<Schema>();
-  const [status, setStatus] = useState<CheckInStatus>(CheckInStatus.Loading);
-  const { currentUser } = useUser();
-
-  const handleCheckIn = async () => {
-    try {
-      const result = await client.mutations.SetUserAsCheckedIn({
-        userId: currentUser.username,
-      });
-
-      console.log("User checked in:", result);
-      setStatus(CheckInStatus.Success);
-    } catch (error) {
-      console.error("Error checking in:", error);
-      setStatus(CheckInStatus.Error);
-    }
-  };
-
-  useEffect(() => {
-    const checkIn = async () => {
-      await handleCheckIn();
-    };
-    if (currentUser.username) {
-      checkIn();
-    }
-  }, [currentUser.username]);
-
-  return (
-    <div className="flex h-[600px] w-full items-center justify-center bg-pastel-pink">
-      {status === CheckInStatus.Loading && (
-        <p className="my-20 text-3xl font-bold text-dark-pink">
-          Checking you in...
-        </p>
-      )}
-      {status === CheckInStatus.Error && (
-        <div className={CHECKIN_STATUS_TILE_STLYES}>
-          <Image
-            src={cross_icon}
-            height={100}
-            width={100}
-            alt="X icon"
-            className="mb-2"
-          />
-          <h1 className={CHECKIN_STATUS_HEADER_STYLES}>Failed to Check-in</h1>
-          <p className={CHECKIN_STATUS_TEXT_STYLES}>
-            We apologize for the inconvenience. Please try checking in again.
-          </p>
-          <Link href="/" className={CHECKIN_STATUS_BUTTON_STYLES}>
-            Go To Home
-          </Link>
-        </div>
-      )}
-      {status === CheckInStatus.Success && (
-        <div className={CHECKIN_STATUS_TILE_STLYES}>
-          <Image
-            src={check_mark_icon}
-            height={80}
-            width={80}
-            alt="Check mark icon"
-            className="mb-4"
-          />
-          <h1 className={CHECKIN_STATUS_HEADER_STYLES}>
-            You&apos;re Checked In!
-          </h1>
-          <p className={CHECKIN_STATUS_TEXT_STYLES}>
-            Thanks for checking in to Hack the Change 2025! Click the button
-            below to return to your profile.
-          </p>
-          <Link
-            href="/participant/profile"
-            className={CHECKIN_STATUS_BUTTON_STYLES}
-          >
-            Go To Profile
-          </Link>
-        </div>
-      )}
-    </div>
-  );
-};
-
-export default CheckInPage;
diff --git a/src/app/participant/page.tsx b/src/app/participant/page.tsx
index 02998236..0c64d1d8 100644
--- a/src/app/participant/page.tsx
+++ b/src/app/participant/page.tsx
@@ -28,7 +28,6 @@ export default function page() {
         <div className="flex flex-col gap-4">
           <NextMealScheduled />
           <GoToFoodTicket />
-          {/* <DevPostSubmission /> */}
         </div>
         <div className="flex flex-col gap-4">
           <ImportantInformation />
diff --git a/src/app/register/team/(pending)/new/page.tsx b/src/app/register/team/(pending)/new/page.tsx
index ab68277b..d7fc0b64 100644
--- a/src/app/register/team/(pending)/new/page.tsx
+++ b/src/app/register/team/(pending)/new/page.tsx
@@ -8,49 +8,52 @@ import { client } from "@/app/QueryProvider";
 import { useUser } from "@/components/contexts/UserContext";
 import PurpleButton from "@/components/PurpleButton";
 import { Underline } from "@/utils/text-utils";
-import { useMutation } from "@tanstack/react-query";
+import { useMutation, useQueryClient } from "@tanstack/react-query";
 
 export default function page() {
+  const queryClient = useQueryClient();
   const [teamName, setTeamName] = useState("");
   const router = useRouter();
-  const user = useUser();
-  const toastRef = useRef<Id>("");
+  const {
+    currentUser: { teamId, id },
+    revalidateUser,
+  } = useUser();
   const teamMutation = useMutation({
-    mutationFn: async (input: string) => {
-      if (user.currentUser.teamId) {
-        throw new Error("User already has a team");
-      }
+    mutationKey: ["CreateTeam"],
+    mutationFn: async (teamName: string) => {
+      if (teamId) throw new Error("User already has a team");
+      const toastObj = toast.loading("Creating team...");
       const res = await client.mutations.CreateTeamWithCode({
-        teamName: input,
-        addCallerToTeam: true,
+        teamName,
+        addCallerToTeam: false, // broken in lambda function.
       });
-      if (res.errors) throw new Error(res.errors[0].message);
-      return res.data;
+      toast.dismiss(toastObj);
+      if (!res.errors && res.data?.body) {
+        const teamId = JSON.parse(res.data.body!.toString()).value;
+        await client.models.User.update({
+          id,
+          teamId,
+        });
+        revalidateUser();
+        return res.data;
+      }
+      throw new Error(res.errors?.[0]?.message);
     },
     onSuccess: (data) => {
-      if (data?.statusCode === 200) {
-        toast.update(toastRef.current, {
-          render: "Team created successfully",
+      if (data.statusCode === 200) {
+        toast.success("Team created successfully", {
           type: "success",
           isLoading: false,
           autoClose: 3000,
         });
-        const teamID = JSON.parse(data.body?.toString() || "").value;
+        queryClient.invalidateQueries({ queryKey: ["User"] });
+        const teamID = JSON.parse(data.body!.toString()).value;
         router.push(`/register/team/${teamID}`);
       }
     },
-    onError: (error) => {
-      toast.update(toastRef.current, {
-        render: error.message,
-        type: "error",
-        isLoading: false,
-        autoClose: 3000,
-      });
-    },
   });
   async function handleFormSubmit(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault();
-    toastRef.current = toast.loading("Creating team...");
     teamMutation.mutate(teamName);
   }
   return (
@@ -77,8 +80,11 @@ export default function page() {
         />
       </div>
       <div className="flex flex-col items-center justify-between gap-4 text-white sm:flex-row">
-        <Link href={"/register/team/ready"}>
-          <PurpleButton type="button">Back</PurpleButton>
+        <Link
+          className="w-[300px] rounded-full border-4 border-white bg-awesomer-purple py-2 text-center text-xl  font-medium text-white shadow-md transition duration-300 hover:opacity-90"
+          href={"/register/team/ready"}
+        >
+          Back
         </Link>
         <PurpleButton disabled={teamMutation.isPending} type="submit">
           {teamMutation.isPending ? "Registering..." : "Register"}
diff --git a/src/components/Dashboard/DevPostLinkUpload.tsx b/src/components/Dashboard/DevPostLinkUpload.tsx
new file mode 100644
index 00000000..1e31f6d0
--- /dev/null
+++ b/src/components/Dashboard/DevPostLinkUpload.tsx
@@ -0,0 +1,66 @@
+"use client";
+
+import { useState } from "react";
+import { FaCircleArrowRight } from "react-icons/fa6";
+import { toast } from "react-toastify";
+import { client } from "@/app/QueryProvider";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import { useUser } from "../contexts/UserContext";
+
+export default function DevPostLinkUpload() {
+  const {
+    currentUser: { team, id: userId },
+  } = useUser();
+  const { data: userTeam } = useQuery({
+    queryKey: ["Team", userId],
+    queryFn: async () => {
+      const userTeam = await team();
+      if (!userTeam || userTeam.errors)
+        throw new Error(
+          userTeam?.errors?.[0]?.message ?? "Error fetching team data",
+        );
+      return userTeam.data;
+    },
+  });
+  const [devPostLink, setDevPostLink] = useState("");
+  const devPostMutation = useMutation({
+    mutationKey: ["DevPostLink"],
+    mutationFn: async () => {
+      if (!devPostLink || !userTeam) return;
+      const { data, errors } = await client.models.Team.update({
+        id: userTeam.id,
+        devPostLink,
+      });
+      if (errors) {
+        toast.error(errors[0].message ?? "Error updating DevPost link");
+        throw new Error(errors[0].message);
+      }
+      return data;
+    },
+    onSuccess: () => {
+      toast.success("DevPost link updated successfully!");
+    },
+    onError: () => {
+      toast.error("Error updating DevPost link. Please try again.");
+    },
+  });
+  const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault();
+    devPostMutation.mutate();
+  };
+  return (
+    <form onSubmit={handleSubmit} className="flex items-center gap-2 py-2">
+      <input
+        className={`md:text-md  my-2 w-full  rounded-full border-2 border-gray-300 bg-gray-100 py-2 ps-3 text-sm text-black `}
+        placeholder={userTeam?.devPostLink ?? "Awaiting Submission..."}
+        onChange={(e) => setDevPostLink(e.target.value)}
+        value={devPostLink}
+        name={devPostLink}
+      />
+
+      <button type="submit" className="border-1 rounded-full border-red-500 ">
+        <FaCircleArrowRight color="grey" />
+      </button>
+    </form>
+  );
+}
diff --git a/src/components/Dashboard/SubmissionDueClock.tsx b/src/components/Dashboard/SubmissionDueClock.tsx
index a3ac7480..31f35ce6 100644
--- a/src/components/Dashboard/SubmissionDueClock.tsx
+++ b/src/components/Dashboard/SubmissionDueClock.tsx
@@ -4,6 +4,7 @@ import { useEffect, useMemo, useState } from "react";
 import { hackathonTimeRemaining } from "@/utils/date-utils";
 import CountdownTimer from "../LandingPage/CountdownTimer";
 import Card from "./Card";
+import DevPostLinkUpload from "./DevPostLinkUpload";
 
 export default function SubmissionDueClock({
   submissionTime,
@@ -50,6 +51,7 @@ export default function SubmissionDueClock({
           className="w-32 bg-dark-green md:w-52 lg:w-52"
         />
       </div>
+      <DevPostLinkUpload />
     </Card>
   );
 }
diff --git a/src/components/PurpleButton.tsx b/src/components/PurpleButton.tsx
index 5b3a3bd8..aa24a519 100644
--- a/src/components/PurpleButton.tsx
+++ b/src/components/PurpleButton.tsx
@@ -6,15 +6,18 @@ export default function PurpleButton({
   type,
   onClick,
   className,
+  tabIndex,
 }: {
   children: React.ReactNode;
   disabled?: boolean;
   type?: HTMLButtonElement["type"];
   onClick?: () => void;
   className?: string;
+  tabIndex?: number;
 }) {
   return (
     <button
+      tabIndex={tabIndex}
       type={type}
       disabled={disabled}
       onClick={onClick}
diff --git a/src/components/UserProfile/TeamProfile.tsx b/src/components/UserProfile/TeamProfile.tsx
index 674331c0..a0c6b195 100644
--- a/src/components/UserProfile/TeamProfile.tsx
+++ b/src/components/UserProfile/TeamProfile.tsx
@@ -9,15 +9,11 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 
 const BUTTON_STYLES =
   " rounded-full border-4 border-white bg-grapefruit px-10  md:px-12 py-2 my-2 text-white";
-
 const TEAM_INSTRUCTION_STYLES =
   "bg-pink bg-white/30 mx-10 my-10 rounded-3xl  border-4 border-white bg-white px-10 py-20 md:px-20 md:py-16";
-
 const TeamProfile = () => {
   const queryClient = useQueryClient();
-
   const userTeamId = useUser().currentUser.teamId as string;
-
   const { data, isFetching } = useQuery({
     initialData: {} as Schema["Team"]["type"],
     initialDataUpdatedAt: 0,
@@ -26,14 +22,11 @@ const TeamProfile = () => {
       const teamResponse = await client.models.Team.get({
         id: userTeamId,
       });
-
       if (teamResponse.errors) throw new Error(teamResponse.errors[0].message);
-
       return teamResponse.data;
     },
     enabled: !!userTeamId,
   });
-
   const teamMutation = useMutation({
     mutationFn: async () => {
       try {
@@ -49,7 +42,6 @@ const TeamProfile = () => {
       });
     },
   });
-
   return (
     <>
       {isFetching || !userTeamId ? (
diff --git a/src/components/UserProfile/UserForm.tsx b/src/components/UserProfile/UserForm.tsx
index 4cdd56a3..3799d7a2 100644
--- a/src/components/UserProfile/UserForm.tsx
+++ b/src/components/UserProfile/UserForm.tsx
@@ -1,32 +1,16 @@
 "use client";
 
-import { useEffect, useMemo } from "react";
+import { useState } from "react";
 import { useFormStatus } from "react-dom";
-import { useForm } from "react-hook-form";
-import { type Schema } from "@/amplify/data/resource";
-import { useUserDetails } from "@/components/contexts/UserDetailsContext";
-import { type UserFormProp } from "@/components/UserProfile/UserProfile";
-
-type UserFormData = {
-  id: string;
-  firstName: string;
-  lastName: string;
-  email: string;
-  institution: string;
-  willEatMeals: boolean;
-  allergies: string;
-};
-
-const getFormValues = (userDetails: any): UserFormData => ({
-  id: userDetails?.id || "",
-  firstName: userDetails?.firstName || "",
-  lastName: userDetails?.lastName || "",
-  email: userDetails?.email || "",
-  institution: userDetails?.institution || "",
-  willEatMeals: Boolean(userDetails?.willEatMeals),
-  allergies: userDetails?.allergies || "",
-});
-
+import { useUser } from "../contexts/UserContext";
+
+interface UserFormProp {
+  setIsEditing: React.Dispatch<React.SetStateAction<boolean>>;
+  setEnableCancelSave: React.Dispatch<React.SetStateAction<boolean>>;
+  enableCancelSave: boolean;
+  isEditing: boolean;
+  userMutation: any;
+}
 export default function UserForm({
   userMutation,
   setIsEditing,
@@ -35,142 +19,108 @@ export default function UserForm({
   setEnableCancelSave,
 }: UserFormProp) {
   const { pending } = useFormStatus();
-  const { userDetails } = useUserDetails();
-  const value = useMemo(() => getFormValues(userDetails), [userDetails]);
-  const {
-    register,
-    handleSubmit,
-    reset,
-    watch,
-    formState: { errors, dirtyFields },
-  } = useForm<UserFormData>({
-    defaultValues: value,
-  });
+  const { currentUser } = useUser();
+  const [formState, setFormState] = useState(currentUser);
 
-  const willEatMeals = watch("willEatMeals");
-
-  useEffect(() => {
-    if (userDetails) {
-      reset(value);
-    }
-  }, [value, reset]);
+  const onChange = (e: React.ChangeEvent<HTMLInputElement>): void => {
+    const { name, value } = e.target;
+    setFormState((prevState) => ({ ...prevState, [name]: value }));
+  };
 
   const handleCancelClick = () => {
     setIsEditing(false);
     setEnableCancelSave(false);
-    reset(value);
   };
 
-  const handleSaveClick = (data: UserFormData) => {
+  const handleSaveClick = (e: React.FormEvent<HTMLFormElement>) => {
+    e.preventDefault(); // Prevent default form submission behavior
     setIsEditing(false); // Exit edit mode
     setEnableCancelSave(false);
-
-    const dirtyData: Record<string, any> = {};
-
-    Object.keys(dirtyFields).forEach((key) => {
-      const fieldKey = key as keyof UserFormData;
-      if (dirtyFields[fieldKey]) {
-        dirtyData[fieldKey] = data[fieldKey];
-      }
-    });
-
-    if (dirtyFields.willEatMeals && data.willEatMeals) {
-      dirtyData.allergies = data.allergies;
-    }
-
-    const formattedData = {
-      id: data.id,
-      ...dirtyData,
-    } as Schema["User"]["type"];
-
-    userMutation.mutate(formattedData);
+    userMutation.mutate(formState);
+    console.log(formState); // Log the form state
   };
 
   return (
-    <form
-      className={"flex flex-col md:mx-10"}
-      onSubmit={handleSubmit(handleSaveClick)}
-    >
+    <form className={"flex flex-col md:mx-10"} onSubmit={handleSaveClick}>
       <div className="grid grid-cols-1 md:grid-cols-2 md:gap-5">
         <div className="flex flex-col">
           <label>First Name</label>
           <input
             className={`md:text-md  my-2 rounded-full border-4 border-white bg-white py-2 ps-3 text-sm ${isEditing ? "text-black" : "text-ehhh-grey"}`}
             type="text"
-            placeholder={"First Name"}
-            {...register("firstName", {
-              required: isEditing ? "First name is required" : false,
-            })}
-            disabled={!isEditing} // Disabled when not in edit mode
+            placeholder={formState.firstName ?? "First Name"}
+            onChange={onChange}
+            value={formState.firstName ?? ""}
+            name={"firstName"}
+            disabled={!isEditing}
           />
-          {errors.firstName && (
-            <span className="text-sm text-strawberry-red">
-              {errors.firstName.message}
-            </span>
-          )}
         </div>
         <div className="flex flex-col">
           <label>Last Name</label>
           <input
             className={`${"md:text-md  my-2 rounded-full border-4 border-white  bg-white py-2 ps-3 text-sm"} ${isEditing ? "text-black" : "text-ehhh-grey"}`}
             type="text"
-            placeholder={"Last Name"}
-            {...register("lastName", {
-              required: isEditing ? "Last name is required" : false,
-            })}
-            disabled={!isEditing} // Disabled when not in edit mode
+            placeholder={formState.lastName ?? "Last Name"}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e)}
+            name="lastName"
+            value={formState.lastName ?? ""}
+            disabled={!isEditing}
           />
-          {errors.lastName && (
-            <span className="text-sm text-strawberry-red">
-              {errors.lastName.message}
-            </span>
-          )}
         </div>
       </div>
       <label>Email</label>
       <input
         className={`${"md:text-md  my-2 rounded-full border-4  border-white bg-white py-2 ps-3 text-sm"} ${"text-ehhh-grey"}`}
-        type="email"
-        value={userDetails?.email || ""}
-        disabled // Should not be able to edit email
+        type="text"
+        placeholder={formState.email ?? ""}
+        onChange={onChange}
+        value={formState.email ?? ""}
+        name={"email"}
+        disabled
       />
       <label>Password</label>
       <input
         className={`${"md:text-md  my-2 rounded-full border-4  border-white  bg-white py-2 ps-3 text-sm"} ${isEditing ? "text-black" : "text-ehhh-grey"}`}
         type="password"
         placeholder="••••••••"
-        disabled={!isEditing} // Disabled when not in edit mode
+        disabled={!isEditing}
+        name="password"
       />
       <label>Institution</label>
       <input
         className={`${"md:text-md  my-2 rounded-full border-4  border-white  bg-white py-2 ps-3 text-sm"} ${isEditing ? "text-black" : "text-ehhh-grey"}`}
         type="text"
-        placeholder={"e.g. University of Calgary"}
-        {...register("institution")}
+        placeholder={formState.institution ?? "e.g. University of Calgary"}
+        onChange={onChange}
+        value={formState.institution ?? ""}
+        name="institution"
         disabled={!isEditing} // Disabled when not in edit mode
       />
       <label>Do you want provided meals at the hackathon?</label>
       <select
         className={`${"md:text-md  my-2 rounded-full border-4  border-white  bg-white py-2 ps-3 text-sm"} ${isEditing ? "text-black" : "text-ehhh-grey"}`}
-        {...register("willEatMeals", {
-          setValueAs: (value) => {
-            if (typeof value === "boolean") return value;
-            return value === "true";
-          },
-        })}
+        value={formState.willEatMeals ? "Yes" : "No"}
+        onChange={(e) =>
+          setFormState((prevState) => ({
+            ...prevState,
+            willEatMeals: e.target.value === "Yes",
+          }))
+        }
         disabled={!isEditing} // Disabled when not in edit mode
       >
-        <option value="true">Yes</option>
-        <option value="false">No</option>
+        <option value="Yes">Yes</option>
+        <option value="No">No</option>
       </select>
-      {willEatMeals && (
+      {formState.willEatMeals && (
         <>
           <label>Do you have any allergies?</label>
           <input
             className={`${"md:text-md  my-2 rounded-full border-4  border-white  bg-white  py-2 ps-3 text-sm"} ${isEditing ? "text-black" : "text-ehhh-grey"}`}
             type="text"
-            placeholder={"e.g. Dairy, Nuts, etc."}
-            {...register("allergies")}
+            placeholder={formState.allergies ?? "e.g. Dairy, Nuts, etc."}
+            onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e)}
+            value={formState.allergies ?? ""}
+            name="allergies"
             disabled={!isEditing} // Disabled when not in edit mode
           />
         </>
@@ -183,14 +133,14 @@ export default function UserForm({
       <input
         className={`${"md:text-md  my-2 rounded-full border-4  border-white  bg-white  py-2 ps-3 text-sm"} ${"text-ehhh-grey"}`}
         type="text"
-        value={userDetails?.checkedIn ? "Yes" : "No"}
+        value={formState.completedRegistration ? "Yes" : "No"}
+        onChange={(e: React.ChangeEvent<HTMLInputElement>) => onChange(e)}
         readOnly
       />
       <div className=" mb-10 mt-3 flex flex-col justify-between md:flex-row">
         {enableCancelSave ? (
           <>
             <button
-              type="button"
               className={
                 "my-2 rounded-full border-4 border-white bg-grapefruit  px-10 py-2 text-white md:px-12"
               }
diff --git a/src/components/UserProfile/UserProfile.tsx b/src/components/UserProfile/UserProfile.tsx
index f6fa5e8d..0b009ea4 100644
--- a/src/components/UserProfile/UserProfile.tsx
+++ b/src/components/UserProfile/UserProfile.tsx
@@ -2,71 +2,23 @@
 
 import Image from "next/image";
 import { useState } from "react";
-import { type Schema } from "@/amplify/data/resource";
 import { client } from "@/app/QueryProvider";
+import type { IUser } from "@/components/contexts/UserContext";
 import { useUser } from "@/components/contexts/UserContext";
 import KevinLoadingRing from "@/components/KevinLoadingRing";
 import UserForm from "@/components/UserProfile/UserForm";
-import { useMutation, useQuery } from "@tanstack/react-query";
+import { useMutation } from "@tanstack/react-query";
 
-export interface UserFormProp {
-  data: Schema["User"]["type"];
-  setIsEditing: React.Dispatch<React.SetStateAction<boolean>>;
-  setEnableCancelSave: React.Dispatch<React.SetStateAction<boolean>>;
-  enableCancelSave: boolean;
-  isEditing: boolean;
-  userMutation: any;
-}
-
-const UserProfile = () => {
-  const { currentUser, isFetching: userContextIsFetching } = useUser();
-  const userId = currentUser.username as string;
-
-  const { data, isFetching } = useQuery({
-    initialData: {} as Schema["User"]["type"],
-    initialDataUpdatedAt: 0,
-    queryKey: ["User", userId],
-    queryFn: async () => {
-      const response = await client.models.User.get({
-        id: userId,
-      });
-
-      if (response.errors) throw new Error(response.errors[0].message);
-
-      return response.data;
-    },
-    enabled: !!userId,
-  });
+export default function UserProfile() {
+  const { isFetching: userContextIsFetching } = useUser();
 
   const userMutation = useMutation({
-    //mutation takes parameters of input with User type
     mutationKey: ["User"],
-    mutationFn: async (input: Schema["User"]["type"]) => {
-      const {
-        createdAt,
-        updatedAt,
-        team,
-        teamId,
-        checkedIn,
-        profileOwner,
-        email,
-        role,
-        ...extractedFields
-      } = input;
-      // TODO this can be cleaned if we use React Hook Form to handle form state better
-      (void createdAt,
-        void updatedAt,
-        void team,
-        void teamId,
-        void checkedIn,
-        void profileOwner);
-      (void email, void role);
-
+    mutationFn: async (input: IUser) => {
       try {
-        await client.models.User.update(extractedFields);
+        await client.models.User.update(input);
       } catch (error) {
-        console.error("Error updating user", error);
-        throw error;
+        throw new Error("Failed to update user " + error);
       }
     },
   });
@@ -81,64 +33,55 @@ const UserProfile = () => {
       setEnableCancelSave(true);
     }
   };
-
+  if (userContextIsFetching)
+    return (
+      <div className="flex w-full items-center justify-center">
+        <KevinLoadingRing />
+      </div>
+    );
   return (
-    <>
-      {" "}
-      {isFetching || userContextIsFetching ? (
-        <div className="flex w-full items-center justify-center">
-          <KevinLoadingRing />
+    <div className="flex w-full flex-col items-start bg-fuzzy-peach md:items-start">
+      <div className="hidden md:block">
+        <Image
+          src="/images/userProfile/Star_Icons.svg"
+          alt="Right Squiggly SVG"
+          width={30}
+          height={30}
+          className="md:absolute md:left-10 md:top-[50rem]"
+        />{" "}
+        <Image
+          src="/images/userProfile/Star_Icons.svg"
+          alt="Right Squiggly SVG"
+          width={30}
+          height={30}
+          className="md:absolute md:right-8 md:top-[30rem]"
+        />{" "}
+        <Image
+          src="/images/userProfile/Star_Icons.svg"
+          alt="Right Squiggly SVG"
+          width={30}
+          height={30}
+          className="md:absolute md:right-10 md:top-[70rem]"
+        />{" "}
+      </div>
+      <div className="w-full md:px-16 md:py-10">
+        <div className="text-apricot mb-3 flex justify-between uppercase md:mx-10">
+          <h1 className="mt-3 text-lg font-bold md:text-2xl">My Details</h1>
+          <button
+            className=" bg-apricot my-2 rounded-full border-4 border-white  px-10 py-2 text-white md:px-12"
+            onClick={handleEditClick}
+          >
+            Edit
+          </button>
         </div>
-      ) : (
-        <div className="flex w-full flex-col items-start bg-fuzzy-peach md:items-start">
-          <div className="hidden md:block">
-            <Image
-              src="/images/userProfile/Star_Icons.svg"
-              alt="Right Squiggly SVG"
-              width={30}
-              height={30}
-              className="md:absolute md:left-10 md:top-[50rem]"
-            />{" "}
-            <Image
-              src="/images/userProfile/Star_Icons.svg"
-              alt="Right Squiggly SVG"
-              width={30}
-              height={30}
-              className="md:absolute md:right-8 md:top-[30rem]"
-            />{" "}
-            <Image
-              src="/images/userProfile/Star_Icons.svg"
-              alt="Right Squiggly SVG"
-              width={30}
-              height={30}
-              className="md:absolute md:right-10 md:top-[70rem]"
-            />{" "}
-          </div>
-          <div className="w-full md:px-16 md:py-10">
-            {/* <ProfileLinks /> */}
-            <div className="mb-3 flex justify-between uppercase text-grapefruit md:mx-10">
-              <h1 className="mt-3 text-lg font-bold md:text-2xl">My Details</h1>
-              <button
-                className="my-2 rounded-full border-4 border-white bg-grapefruit  px-10 py-2 text-white md:px-12"
-                onClick={handleEditClick}
-              >
-                Edit
-              </button>
-            </div>
-            {data && (
-              <UserForm
-                data={data}
-                setIsEditing={setIsEditing}
-                isEditing={isEditing}
-                enableCancelSave={enableCancelSave}
-                setEnableCancelSave={setEnableCancelSave}
-                userMutation={userMutation}
-              />
-            )}
-          </div>
-        </div>
-      )}
-    </>
+        <UserForm
+          setIsEditing={setIsEditing}
+          isEditing={isEditing}
+          enableCancelSave={enableCancelSave}
+          setEnableCancelSave={setEnableCancelSave}
+          userMutation={userMutation}
+        />
+      </div>
+    </div>
   );
-};
-export default UserProfile;
+}
diff --git a/src/components/contexts/Provider.tsx b/src/components/contexts/Provider.tsx
index d69d9763..fe5622c2 100644
--- a/src/components/contexts/Provider.tsx
+++ b/src/components/contexts/Provider.tsx
@@ -1,6 +1,5 @@
 "use client";
 
-import React from "react";
 import { toast } from "react-toastify";
 import { Authenticator } from "@aws-amplify/ui-react";
 import {
@@ -15,39 +14,34 @@ export default function Provider({
 }: {
   children: React.ReactNode | React.ReactNode[];
 }) {
-  const [queryClient] = React.useState(
-    () =>
-      new QueryClient({
-        defaultOptions: {
-          queries: {
-            staleTime: 1000 * 60 * 5,
-            refetchOnWindowFocus: true,
-            initialDataUpdatedAt: 0,
-          },
-        },
-        queryCache: new QueryCache({
-          onError: (error) => {
-            console.error("Query Boundary Caught:", error);
-            // toast.error(`Error loading: ${query.queryKey[0]}`);
-          },
-          // onSuccess(data, query) {
-          //   toast.success(`${query.queryKey[0]} loaded`);
-          // },
-        }),
-        mutationCache: new MutationCache({
-          onError: (error, variables, context, mutation) => {
-            console.error("Mutation Boundary Caught:", error);
-            toast.error(
-              `Error processing: ${mutation.options?.mutationKey?.[0]}`,
-            );
-          },
-          // onSuccess(data, variables, context, mutation) {
-          //   console.log(data, variables, context, mutation);
-          //   toast.success(`${mutation.options?.mutationKey?.[0]} updated`);
-          // },
-        }),
-      }),
-  );
+  const queryClient = new QueryClient({
+    defaultOptions: {
+      queries: {
+        staleTime: 1000 * 60 * 5,
+        refetchOnWindowFocus: true,
+        initialDataUpdatedAt: 0,
+      },
+    },
+    queryCache: new QueryCache({
+      onError: (error, query) => {
+        console.error("Query Boundary Caught:", error);
+        toast.error(`Error loading: ${query.queryKey[0]}`);
+      },
+      // onSuccess(data, query) {
+      //   toast.success(`${query.queryKey[0]} loaded`);
+      // },
+    }),
+    mutationCache: new MutationCache({
+      onError: (error, _, __, mutation) => {
+        console.error("Mutation Boundary Caught:", error);
+        toast.error(`Error processing: ${mutation.options?.mutationKey?.[0]}`);
+      },
+      // onSuccess(data, variables, context, mutation) {
+      //   console.log(data, variables, context, mutation);
+      //   toast.success(`${mutation.options?.mutationKey?.[0]} updated`);
+      // },
+    }),
+  });
 
   return (
     <QueryClientProvider client={queryClient}>
diff --git a/src/components/contexts/UserContext.tsx b/src/components/contexts/UserContext.tsx
index dbbc83a7..3d288eeb 100644
--- a/src/components/contexts/UserContext.tsx
+++ b/src/components/contexts/UserContext.tsx
@@ -18,7 +18,7 @@ export enum UserType {
   Guest = "Guest",
 }
 
-type IUser = Schema["User"]["type"] & {
+export type IUser = Schema["User"]["type"] & {
   type: UserType;
   username: string;
 };
diff --git a/src/components/judging/ScoresTable.tsx b/src/components/judging/ScoresTable.tsx
index facde86a..f4408219 100644
--- a/src/components/judging/ScoresTable.tsx
+++ b/src/components/judging/ScoresTable.tsx
@@ -265,7 +265,7 @@ export default function JudgingTable(props: JudgingTableProps) {
                           scoreObject[columnId]
                         )}
                         <span
-                          className={`text-md ${colorStyles.headerCellBg} pointer-events-none absolute inset-0 flex items-center justify-center bg-opacity-50 font-semibold text-white opacity-0 group-hover:opacity-100`}
+                          className={`text-md ${colorStyles.headerCellBg} bg-opacity/50 pointer-events-none absolute inset-0 flex items-center justify-center font-semibold text-white opacity-0 group-hover:opacity-100`}
                         >
                           Edit
                         </span>