diff --git a/apps/web/package.json b/apps/web/package.json
index d2c3ed25..05c2903d 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -17,6 +17,7 @@
     "@internationalized/date": "^3.5.4",
     "@planetscale/database": "^1.18.0",
     "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-avatar": "^1.0.3",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-dialog": "^1.0.4",
diff --git a/apps/web/src/actions/registration.ts b/apps/web/src/actions/registration.ts
new file mode 100644
index 00000000..2510903b
--- /dev/null
+++ b/apps/web/src/actions/registration.ts
@@ -0,0 +1,141 @@
+"use server"
+import { authenticatedAction } from "@/lib/safe-action"
+import { db,sql } from "db"
+import { put } from "@vercel/blob"
+import { bucketResumeBaseUploadUrl } from "config"
+import z from "zod"
+import { returnValidationErrors } from "next-safe-action"
+import { updateUserResume } from "db/functions"
+import { hackerRegistrationFormValidator } from "@/validators/shared/registration"
+import { userCommonData, userHackerData } from "db/schema"
+import { currentUser } from "@clerk/nextjs/server"
+import c from "config"
+import { DatabaseError } from "db/types"
+import { DUPLICATE_KEY_ERROR_CODE,UNIQUE_KEY_MAPPER_DEFAULT_KEY } from "@/lib/constants"
+
+
+const uploadResumeSchema = z.object({
+	resumeFile: z.any()
+    // .instanceof(File, { message: "Required" })
+    // .refine((file) => file.size > 0, "Required"),
+});
+
+const registerUserSchema = hackerRegistrationFormValidator;
+
+
+export const uploadResume = authenticatedAction
+  .schema(uploadResumeSchema).
+  action(
+    async ({ ctx:{ userId}, parsedInput:{resumeFile} }) =>{
+    const fileLocation = `${bucketResumeBaseUploadUrl}/${resumeFile.name}`;
+    const newBlob = await put(fileLocation, resumeFile, {
+      access: "public",
+    });
+    
+    await updateUserResume(userId,newBlob.url);
+
+      return {
+        success:true,
+        resume_url:newBlob.url
+      }
+    }
+);
+
+export const registerUser = authenticatedAction
+  .schema(registerUserSchema)
+  .action(
+    async ( { ctx:{ userId }, parsedInput}) =>{
+      // Reccomended: Destructure out your unique constraints / primary keys ahead of time to ensure that they can be cause short circuit logic if a unique constraint is violated
+      const { resumeFile, hackerTag, email,
+        university,major,schoolID,levelOfStudy,hackathonsAttended,softwareExperience, heardFrom,GitHub,LinkedIn,PersonalWebsite,hasAcceptedMLHCoC,hasSharedDataWithMLH,isEmailable,
+        ...userData
+      }  = parsedInput;
+
+      const currUser = await currentUser();
+
+      console.log('resume file is',resumeFile);
+      throw new Error('test');
+		if (!currUser) {
+			returnValidationErrors(z.null(), {
+				_errors: ["User does not exist"],
+			});
+		}
+      const totalUserCount = await db
+			.select({ count: sql<number>`count(*)`.mapWith(Number) })
+			.from(userCommonData);
+      
+      try{
+        await db.transaction(async (tx) => {
+        //  Add user common insertion
+          await tx.insert(userCommonData).values({
+				// Slight optimization to short circuit is to add all of your unique keys at the top
+				clerkID: userId,
+				hackerTag: hackerTag.toLocaleLowerCase(),
+				email,
+				...userData,
+				profilePhoto: currUser.imageUrl,
+				skills: userData.skills.map((v) => v.text.toLowerCase()),
+				isFullyRegistered: true,
+				dietRestrictions: userData.dietRestrictions,
+			});
+
+          await tx
+            .insert(userHackerData)
+            .values({
+              clerkID: userId,
+              university,
+              major,
+              schoolID,
+              levelOfStudy,
+              hackathonsAttended,
+              softwareExperience,
+              heardFrom,
+              GitHub,
+              LinkedIn,
+              PersonalWebsite,
+              resume:undefined,
+              group:
+                totalUserCount[0].count % Object.keys(c.groups).length,
+              hasAcceptedMLHCoC,
+              hasSharedDataWithMLH,
+              isEmailable,
+            })
+      });
+      }catch(e){
+        // Catch duplicates because they will be based off of the error code 23505
+        if (e instanceof DatabaseError && e.code  === DUPLICATE_KEY_ERROR_CODE){
+          console.error(e);
+          const constraintKeyIndex = e.constraint as keyof typeof c.db.UniqueKeyMapper;
+          return {
+				success: false,
+				message: c.db.UniqueKeyMapper[constraintKeyIndex  ?? UNIQUE_KEY_MAPPER_DEFAULT_KEY] ?? e.detail,
+			};
+        }else{
+          throw e;
+        }
+      }
+      console.log('Contents of resumeFile',resumeFile);
+      // Determine upload stuff
+      // if (resumeFile){
+      //   console.log("Uploading blob");
+      //   const res = await uploadResume({resumeFile});
+      //   if (res?.serverError){
+      //     return {
+			// 	success: true,
+			// 	message:
+			// 		"Registration created successfully but there was an error uploading your resume.",
+			// };
+      //   }
+      // console.log("Success posting");
+      // }
+
+      return {
+        success:true,
+        message:"Registration created successfully"
+      }
+
+    }
+  )
+
+
+
diff --git a/apps/web/src/actions/user-profile-mod.ts b/apps/web/src/actions/user-profile-mod.ts
index 66693bce..31f8ee81 100644
--- a/apps/web/src/actions/user-profile-mod.ts
+++ b/apps/web/src/actions/user-profile-mod.ts
@@ -10,6 +10,7 @@ import { decodeBase64AsFile } from "@/lib/utils/shared/files";
 import { returnValidationErrors } from "next-safe-action";
 import { revalidatePath } from "next/cache";
 import { getUser } from "db/functions";
+import c from "config";
 
 // TODO: Add skill updating
 export const modifyRegistrationData = authenticatedAction
diff --git a/apps/web/src/app/api/registration/create/route.ts b/apps/web/src/app/api/registration/create/route.ts
index f41821af..f40e9f8a 100644
--- a/apps/web/src/app/api/registration/create/route.ts
+++ b/apps/web/src/app/api/registration/create/route.ts
@@ -3,128 +3,159 @@ import { NextResponse } from "next/server";
 import { db } from "db";
 import { sql } from "db/drizzle";
 import { userCommonData, userHackerData } from "db/schema";
-import { RegisterFormValidator } from "@/validators/shared/RegisterForm";
+import { hackerRegistrationFormValidator } from "@/validators/shared/registration";
 import c from "config";
 import { z } from "zod";
 import { getUser, getUserByTag } from "db/functions";
+import { del } from "@vercel/blob";
 
 export async function POST(req: Request) {
-	const rawBody = await req.json();
-	const parsedBody = RegisterFormValidator.merge(
-		z.object({ resume: z.string().url() }),
-	).safeParse(rawBody);
+	let resume: string | undefined;
+	try {
+		const rawBody = await req.json();
+		const parsedBody = hackerRegistrationFormValidator
+			.merge(z.object({ resume: z.string().url() }))
+			.safeParse(rawBody);
 
-	if (!parsedBody.success) {
-		return NextResponse.json(
-			{
-				success: false,
-				message: "Malformed request body.",
-			},
-			{ status: 400 },
-		);
-	}
+		if (!parsedBody.success) {
+			return NextResponse.json(
+				{
+					success: false,
+					message: "Malformed request body.",
+				},
+				{ status: 400 },
+			);
+		}
 
-	const body = parsedBody.data;
-	const user = await currentUser();
+		const body = parsedBody.data;
+		resume = body.resume;
+		const user = await currentUser();
 
-	if (!user) {
-		console.log("no user");
-		return NextResponse.json(
-			{
-				success: false,
-				message: "You must be logged in to register.",
-			},
-			{ status: 401 },
+		if (!user) {
+			if (resume !== c.noResumeProvidedURL) {
+				await del(body.resume);
+			}
+			console.log("no user");
+			return NextResponse.json(
+				{
+					success: false,
+					message: "You must be logged in to register.",
+				},
+				{ status: 401 },
+			);
+		}
+
+		const lookupByUserID = await getUser(user.id);
+
+		if (lookupByUserID) {
+			if (resume !== c.noResumeProvidedURL) {
+				await del(body.resume);
+			}
+			return NextResponse.json(
+				{
+					success: false,
+					message: "You are already registered.",
+				},
+				{ status: 400 },
+			);
+		}
+
+		const lookupByHackerTag = await getUserByTag(
+			body.hackerTag.toLowerCase(),
 		);
-	}
 
-	const lookupByUserID = await getUser(user.id);
+		if (lookupByHackerTag) {
+			if (body.resume !== c.noResumeProvidedURL) {
+				await del(body.resume);
+			}
+			return NextResponse.json({
+				success: false,
+				message: "hackertag_not_unique",
+			});
+		}
 
-	if (lookupByUserID) {
-		return NextResponse.json(
-			{
+		if (!body.hasAcceptedMLHCoC || !body.hasSharedDataWithMLH) {
+			if (body.resume !== c.noResumeProvidedURL) {
+				await del(body.resume);
+			}
+			return NextResponse.json({
 				success: false,
-				message: "You are already registered.",
-			},
-			{ status: 400 },
-		);
-	}
+				message:
+					"You must accept the MLH Code of Conduct and Privacy Policy.",
+			});
+		}
 
-	const lookupByHackerTag = await getUserByTag(body.hackerTag.toLowerCase());
+		const totalUserCount = await db
+			.select({ count: sql<number>`count(*)`.mapWith(Number) })
+			.from(userCommonData);
 
-	if (lookupByHackerTag) {
-		return NextResponse.json({
-			success: false,
-			message: "hackertag_not_unique",
+		await db.transaction(async (tx) => {
+			await tx.insert(userCommonData).values({
+				clerkID: user.id,
+				firstName: body.firstName,
+				lastName: body.lastName,
+				email: body.email,
+				hackerTag: body.hackerTag.toLowerCase(),
+				age: body.age,
+				gender: body.gender,
+				race: body.race,
+				ethnicity: body.ethnicity,
+				shirtSize: body.shirtSize,
+				dietRestrictions: body.dietRestrictions,
+				accommodationNote: body.accommodationNote || null,
+				discord: body.discord,
+				pronouns: body.pronouns,
+				bio: body.bio,
+				skills: body.skills.map((v) => v.text.toLowerCase()),
+				profilePhoto: user.imageUrl,
+				isFullyRegistered: true,
+				phoneNumber: body.phoneNumber,
+				isSearchable: body.isSearchable,
+				countryOfResidence: body.countryOfResidence,
+			});
+
+			await tx.insert(userHackerData).values({
+				clerkID: user.id,
+				university: body.university,
+				major: body.major,
+				schoolID: body.schoolID,
+				levelOfStudy: body.levelOfStudy,
+				hackathonsAttended: body.hackathonsAttended,
+				softwareExperience: body.softwareExperience,
+				heardFrom: body.heardFrom || null,
+				GitHub: body.GitHub,
+				LinkedIn: body.LinkedIn,
+				PersonalWebsite: body.PersonalWebsite,
+				resume: body.resume,
+				group: totalUserCount[0].count % Object.keys(c.groups).length,
+				hasAcceptedMLHCoC: body.hasAcceptedMLHCoC,
+				hasSharedDataWithMLH: body.hasSharedDataWithMLH,
+				isEmailable: body.isEmailable,
+			});
 		});
-	}
 
-	const totalUserCount = await db
-		.select({ count: sql<number>`count(*)`.mapWith(Number) })
-		.from(userCommonData);
+		// sendEmail({
+		// 	to: body.email,
+		// 	subject: `You are now registered for ${c.hackathonName} ${c.itteration}!`,
+		// });
 
-	if (!body.hasAcceptedMLHCoC || !body.hasSharedDataWithMLH) {
 		return NextResponse.json({
-			success: false,
-			message:
-				"You must accept the MLH Code of Conduct and Privacy Policy.",
+			success: true,
+			message: "Successfully created registration!",
 		});
+	} catch (e) {
+		console.error(`A fatal error occured: `, e);
+		if (resume) {
+			await del(resume);
+		}
+		return NextResponse.json(
+			{
+				success: false,
+				message: "A fatal error occured.",
+			},
+			{ status: 500 },
+		);
 	}
-
-	await db.transaction(async (tx) => {
-		await tx.insert(userCommonData).values({
-			clerkID: user.id,
-			firstName: body.firstName,
-			lastName: body.lastName,
-			email: body.email,
-			hackerTag: body.hackerTag.toLowerCase(),
-			age: body.age,
-			gender: body.gender,
-			race: body.race,
-			ethnicity: body.ethnicity,
-			shirtSize: body.shirtSize,
-			dietRestrictions: body.dietaryRestrictions,
-			accommodationNote: body.accommodationNote || null,
-			discord: body.profileDiscordName,
-			pronouns: body.pronouns,
-			bio: body.bio,
-			skills: body.skills.map((v) => v.text.toLowerCase()),
-			profilePhoto: user.imageUrl,
-			isFullyRegistered: true,
-			phoneNumber: body.phoneNumber,
-			isSearchable: body.profileIsSearchable,
-			countryOfResidence: body.countryOfResidence,
-		});
-
-		await tx.insert(userHackerData).values({
-			clerkID: user.id,
-			university: body.university,
-			major: body.major,
-			schoolID: body.schoolID,
-			levelOfStudy: body.levelOfStudy,
-			hackathonsAttended: body.hackathonsAttended,
-			softwareExperience: body.softwareBuildingExperience,
-			heardFrom: body.heardAboutEvent || null,
-			GitHub: body.github,
-			LinkedIn: body.linkedin,
-			PersonalWebsite: body.personalWebsite,
-			resume: body.resume,
-			group: totalUserCount[0].count % Object.keys(c.groups).length,
-			hasAcceptedMLHCoC: body.hasAcceptedMLHCoC,
-			hasSharedDataWithMLH: body.hasSharedDataWithMLH,
-			isEmailable: body.isEmailable,
-		});
-	});
-
-	// sendEmail({
-	// 	to: body.email,
-	// 	subject: `You are now registered for ${c.hackathonName} ${c.itteration}!`,
-	// });
-
-	return NextResponse.json({
-		success: true,
-		message: "Successfully created registration!",
-	});
 }
 
 export const runtime = "edge";
diff --git a/apps/web/src/components/landing/MLHBadge.tsx b/apps/web/src/components/landing/MLHBadge.tsx
index ac22242b..7c0e49c6 100644
--- a/apps/web/src/components/landing/MLHBadge.tsx
+++ b/apps/web/src/components/landing/MLHBadge.tsx
@@ -9,12 +9,12 @@ export default function MLHBadge() {
 					id="mlh-trust-badge"
 					className="absolute right-5 top-0 z-50 w-[10%] min-w-[60px] max-w-[100px]"
 					// style="display:block;max-width:100px;min-width:60px;position:fixed;right:50px;top:0;width:10%;z-index:10000"
-					href="https://mlh.io/na?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2024-season&utm_content=black"
+					href="https://mlh.io/na?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2025-season&utm_content=black"
 					target="_blank"
 				>
 					<Image
-						src="https://s3.amazonaws.com/logged-assets/trust-badge/2024/mlh-trust-badge-2024-black.svg"
-						alt="Major League Hacking 2024 Hackathon Season"
+						src="https://s3.amazonaws.com/logged-assets/trust-badge/2025/mlh-trust-badge-2025-black.svg"
+						alt="Major League Hacking 2025 Hackathon Season"
 						width={0}
 						height={0}
 						className="aspect-auto h-auto w-full"
@@ -27,12 +27,12 @@ export default function MLHBadge() {
 					id="mlh-trust-badge"
 					className="absolute right-5 top-0 z-50 w-[10%] min-w-[60px] max-w-[100px]"
 					// style="display:block;max-width:100px;min-width:60px;position:fixed;right:50px;top:0;width:10%;z-index:10000"
-					href="https://mlh.io/na?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2024-season&utm_content=white"
+					href="https://mlh.io/na?utm_source=na-hackathon&utm_medium=TrustBadge&utm_campaign=2025-season&utm_content=white"
 					target="_blank"
 				>
 					<Image
-						src="https://s3.amazonaws.com/logged-assets/trust-badge/2024/mlh-trust-badge-2024-white.svg"
-						alt="Major League Hacking 2024 Hackathon Season"
+						src="https://s3.amazonaws.com/logged-assets/trust-badge/2025/mlh-trust-badge-2025-white.svg"
+						alt="Major League Hacking 2025 Hackathon Season"
 						width={0}
 						height={0}
 						className="aspect-auto h-auto w-full"
diff --git a/apps/web/src/components/registration/CreatingRegistration.tsx b/apps/web/src/components/registration/CreatingRegistration.tsx
index 9505b6b6..343916d3 100644
--- a/apps/web/src/components/registration/CreatingRegistration.tsx
+++ b/apps/web/src/components/registration/CreatingRegistration.tsx
@@ -1,18 +1,40 @@
-import { Bars } from "react-loader-spinner";
+import { ThreeCircles } from "react-loader-spinner";
+import { CircleCheckBig } from "lucide-react";
+
+interface CreatingRegistrationProps {
+	hasSuccess: boolean | undefined;
+	isLoading: boolean;
+}
+export default function CreatingRegistration(props: CreatingRegistrationProps) {
+	const { hasSuccess, isLoading } = props;
+
+	const isLoadingState = isLoading && !hasSuccess;
+	const hasSuccessState = hasSuccess && isLoading;
+
+	const message = isLoadingState
+		? "Creating Your Registration..."
+		: hasSuccessState
+			? "Registration successfully created! Redirecting to the dashboard..."
+			: "Something Went Wrong. Please Try Again.";
 
-export default function CreatingRegistration() {
 	return (
 		<main className="absolute bottom-0 left-0 z-10 flex min-h-screen w-screen flex-col items-center justify-center gap-y-20 bg-background">
-			<h1 className="text-3xl font-black">Creating Your Registration!</h1>
-			<Bars
-				height="80"
-				width="80"
-				color="hsl(var(--primary))"
-				ariaLabel="bars-loading"
-				wrapperStyle={{}}
-				wrapperClass=""
-				visible={true}
-			/>
+			<h1 className="w-full text-center text-3xl font-black">
+				{message}
+			</h1>
+			{hasSuccessState ? (
+				<CircleCheckBig size={80} color="#16a34a" />
+			) : (
+				<ThreeCircles
+					height="80"
+					width="80"
+					color="hsl(var(--primary))"
+					ariaLabel="bars-loading"
+					wrapperStyle={{}}
+					wrapperClass=""
+					visible={true}
+				/>
+			)}
 		</main>
 	);
 }
diff --git a/apps/web/src/components/registration/RegisterForm.tsx b/apps/web/src/components/registration/RegisterForm.tsx
index 85feddfe..821fc736 100644
--- a/apps/web/src/components/registration/RegisterForm.tsx
+++ b/apps/web/src/components/registration/RegisterForm.tsx
@@ -19,8 +19,7 @@ import {
 } from "@/components/shadcn/ui/select";
 import { Input } from "@/components/shadcn/ui/input";
 import { Button } from "@/components/shadcn/ui/button";
-import { z } from "zod";
-import { RegisterFormValidator } from "@/validators/shared/RegisterForm";
+import { string, z } from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";
 import FormGroupWrapper from "./FormGroupWrapper";
 import { Checkbox } from "@/components/shadcn/ui/checkbox";
@@ -48,26 +47,33 @@ import { useAuth } from "@clerk/nextjs";
 import { BasicServerValidator } from "@/validators/shared/basic";
 import { useRouter } from "next/navigation";
 import { FileRejection, useDropzone } from "react-dropzone";
-import { put, type PutBlobResult } from "@vercel/blob";
+import { put } from "@vercel/blob";
 import { Tag, TagInput } from "@/components/shadcn/ui/tag/tag-input";
 import CreatingRegistration from "./CreatingRegistration";
 import { bucketResumeBaseUploadUrl } from "config";
-import { count } from "console";
-interface RegisterFormProps {
-	defaultEmail: string;
-}
+import { hackerRegistrationFormValidator } from "@/validators/shared/registration";
+import { formatRegistrationField } from "@/lib/utils/client/shared";
+import clsx from "clsx";
+import { capitalizeFirstLetter } from "@/lib/utils/client/shared";
+import RegistrationFeedbackAlert from "./RegistrationFeedbackAlert";
+import { registerUser,uploadResume } from "@/actions/registration";
+import { useAction } from "next-safe-action/hooks";
 
-export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
-	const { isLoaded, userId } = useAuth();
+export default function RegisterForm({
+	defaultEmail,
+}: {
+	defaultEmail: string;
+}) {
+	const { isLoaded } = useAuth();
 	const router = useRouter();
 
-	const form = useForm<z.infer<typeof RegisterFormValidator>>({
-		resolver: zodResolver(RegisterFormValidator),
+	const form = useForm<z.infer<typeof hackerRegistrationFormValidator>>({
+		resolver: zodResolver(hackerRegistrationFormValidator),
 		defaultValues: {
 			email: defaultEmail,
 			hackathonsAttended: 0,
-			dietaryRestrictions: [],
-			profileIsSearchable: true,
+			dietRestrictions: [],
+			isSearchable: true,
 			bio: "",
 			isEmailable: false,
 			// The rest of these are default values to prevent the controller / uncontrolled input warning from React
@@ -79,113 +85,101 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
 			age: 0,
 			ethnicity: "" as any,
 			gender: "" as any,
-			major: "",
-			github: "",
+			major: "" as any,
+			GitHub: "",
 			hackerTag: "",
-			heardAboutEvent: "" as any,
+			heardFrom: "" as any,
 			levelOfStudy: "" as any,
-			linkedin: "",
-			personalWebsite: "",
-			profileDiscordName: "",
+			LinkedIn: "",
+			PersonalWebsite: "",
+			discord: "",
 			pronouns: "",
 			race: "" as any,
 			shirtSize: "" as any,
 			schoolID: "",
-			university: "",
+			university: "" as any,
 			phoneNumber: "",
 			countryOfResidence: "",
+			softwareExperience: "" as any,
+			resumeFile: null,
 		},
 	});
+	
+	const {
+		execute: runRegisterUser,
+		status: registerUserStatus,
+		reset: resetRegisterUser,
+	} = useAction(registerUser,{
+		onSuccess: ({ data}) => {
+			console.log("data is: ",data);
+			// Come back and uncoment after testing
+			if (data?.success){
+				// setHasSuccess(true);
+				// 	setTimeout(() => {
+				// 		router.push("/dash");
+				// 	}, 1000);
+			}
+			else{
+				console.error("Error data:",data);
+				setErrorMessage(data?.message ?? 'Unexpected error occured');
+			}
+		},
+		onError: ({ error })=>{
+			console.log("Error is: ",error);
+			resetRegisterUser();
+		}	
+	});
+
+	useEffect(() => {
+		const { unsubscribe } = form.watch((value) => {
+			console.log(value);
+		});
+		return () => unsubscribe();
+	}, [form.watch]);
 
-	const { isSubmitSuccessful, isSubmitted, errors } = form.formState;
+	const isLoading = registerUserStatus === 'executing';
+	
+	const { isSubmitSuccessful, isSubmitted, } = form.formState;
 
 	const hasErrors = !isSubmitSuccessful && isSubmitted;
 
 	const [uploadedFile, setUploadedFile] = useState<File | null>(null);
 	const [skills, setSkills] = useState<Tag[]>([]);
-	const [isLoading, setIsLoading] = useState(false);
+	const [hasSuccess, setHasSuccess] = useState(false);
+	const [errorMessage, setErrorMessage] = useState<string | null>(null);
+
 	const universityValue = form.watch("university");
 	const bioValue = form.watch("bio");
-	const countryValue = form.watch("countryOfResidence");
-
+	const classificationValue = form.watch("levelOfStudy");
+	const isLocalUniversitySelected =
+		universityValue === c.localUniversityName &&
+		classificationValue !== "Recent Grad";
+	
 	useEffect(() => {
-		if (universityValue != c.localUniversityName) {
+		if (universityValue !== c.localUniversityName || classificationValue === 'Recent Grad') {
 			form.setValue("schoolID", "NOT_LOCAL_SCHOOL");
 		} else {
 			form.setValue("schoolID", "");
 		}
 	}, [universityValue]);
 
-	useEffect(() => {
-		console.log(countryValue);
-	}, [countryValue]);
-
-	async function onSubmit(data: z.infer<typeof RegisterFormValidator>) {
-		console.log(data);
-		setIsLoading(true);
-		if (!userId || !isLoaded) {
-			setIsLoading(false);
-			return alert(
-				`Auth has not loaded yet. Please try again! If this is a repeating issue, please contact us at ${c.issueEmail}.`,
-			);
-		}
-
-		if (
-			data.hasAcceptedMLHCoC !== true ||
-			data.hasSharedDataWithMLH !== true
-		) {
-			setIsLoading(false);
-			return alert(
-				"You must accept the MLH Code of Conduct and Privacy Policy to continue.",
-			);
-		}
-
-		let resume: string = c.noResumeProvidedURL;
-
-		if (uploadedFile) {
-			const fileLocation = `${bucketResumeBaseUploadUrl}/${uploadedFile.name}`;
-			const newBlob = await put(fileLocation, uploadedFile, {
-				access: "public",
-				handleBlobUploadUrl: "/api/upload/resume/register",
-			});
-			resume = newBlob.url;
-		}
-
-		const res = await zpostSafe({
-			url: "/api/registration/create",
-			body: { ...data, resume },
-			vRes: BasicServerValidator,
-		});
-
-		if (res.success) {
-			if (res.data.success) {
-				alert(
-					"Registration successfully created! Redirecting to the dashboard.",
-				);
-				router.push("/dash");
-			} else {
-				if (res.data.message == "hackertag_not_unique") {
-					setIsLoading(false);
-					return alert(
-						"The HackerTag you chose has already been taken. Please change it and then resubmit the form.",
-					);
-				}
-				setIsLoading(false);
-				return alert(
-					`Registration not created. Error message: \n\n ${res.data.message} \n\n Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`,
+	function onSubmit(
+		data: z.infer<typeof hackerRegistrationFormValidator>,
+	) {
+			console.log(data);
+			setErrorMessage(null);
+			if (!isLoaded) {
+				setErrorMessage(
+					`Auth has not loaded yet. Please try again! If this is a repeating issue, please contact us at ${c.issueEmail}.`,
 				);
+				return;
 			}
-		} else {
-			setIsLoading(false);
-			alert(
-				`Something went wrong while attempting to register. Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`,
-			);
-			return console.log(
-				`Recieved a unexpected response from the server. Please try again. If this is a continuing issue, please reach out to us at ${c.issueEmail}.`,
-			);
-		}
+			const stringiedUpload = JSON.stringify(uploadedFile);
+			console.log('stringiedUpload is',stringiedUpload);
+			runRegisterUser({...data,resumeFile:stringiedUpload});
+		
 	}
-
+	
 	const onDrop = useCallback(
 		(acceptedFiles: File[], fileRejections: FileRejection[]) => {
 			if (fileRejections.length > 0) {
@@ -195,6 +189,7 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
 			}
 			if (acceptedFiles.length > 0) {
 				setUploadedFile(acceptedFiles[0]);
+				// form.setValue('resumeFile',acceptedFiles[0]);
 			}
 		},
 		[],
@@ -208,1137 +203,1530 @@ export default function RegisterForm({ defaultEmail }: RegisterFormProps) {
 		noDrag: uploadedFile != null,
 	});
 
-	if (isLoading) {
-		return <CreatingRegistration />;
-	}
-
 	return (
-		<div>
-			<Form {...form}>
-				<form
-					onSubmit={form.handleSubmit(onSubmit)}
-					className="space-y-6"
-				>
-					<FormGroupWrapper title="General">
-						<div className="grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-2">
-							<FormField
-								control={form.control}
-								name="firstName"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>First Name</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="John"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="lastName"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Last Name</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="Doe"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="email"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Email</FormLabel>
-										<FormControl>
-											<Input
-												readOnly={
-													defaultEmail.length > 0
-												}
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="phoneNumber"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Phone Number</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="555-555-5555"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<div className="grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-2">
-							<FormField
-								control={form.control}
-								name="age"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Age</FormLabel>
-										<FormControl>
-											<Input type="number" {...field} />
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="gender"
-								render={({ field }) => (
-									<FormItem className="">
-										<FormLabel>Gender</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
+		<>
+			{isLoading || hasSuccess ? (
+				<CreatingRegistration
+					hasSuccess={hasSuccess}
+					isLoading={isLoading}
+				/>
+			) : (
+				<div className="relative">
+					<Form {...form}>
+						<form
+							onSubmit={form.handleSubmit(onSubmit)}
+							className="space-y-6"
+						>
+							<FormGroupWrapper title="General">
+								<div className="grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-2">
+									<FormField
+										control={form.control}
+										name="firstName"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"First Name",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder="John"
+														{...field}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="lastName"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Last Name",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder="Doe"
+														{...field}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="email"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Email",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														readOnly={
+															defaultEmail.length >
+															0
+														}
+														{...field}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="phoneNumber"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Phone Number",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder="555-555-5555"
+														{...field}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+								<div className="grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-2">
+									<FormField
+										control={form.control}
+										name="age"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Age",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														type="number"
+														{...field}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="gender"
+										render={({ field }) => (
+											<FormItem className="">
+												<FormLabel>
+													{formatRegistrationField(
+														"Gender",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
+													}
+													value={field.value}
+												>
+													<FormControl>
+														<SelectTrigger className="w-full">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
+															>
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select a ${capitalizeFirstLetter(field.name)}`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														<SelectGroup>
+															{c.registration.genderOptions.map(
+																(option) => (
+																	<SelectItem
+																		value={
+																			option
+																		}
+																		key={
+																			option
+																		}
+																	>
+																		{option}
+																	</SelectItem>
+																),
+															)}
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="race"
+										render={({ field }) => (
+											<FormItem className="">
+												<FormLabel>
+													{formatRegistrationField(
+														"Race",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
+													}
+													defaultValue={field.value}
+												>
+													<FormControl>
+														<SelectTrigger className="w-full placeholder:text-muted-foreground">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
+															>
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select a ${capitalizeFirstLetter(field.name)}`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent className="">
+														<SelectGroup className="max-h-[400px] w-[var(--radix-select-trigger-width)] overflow-y-scroll">
+															{c.registration.raceOptions.map(
+																(option) => (
+																	<SelectItem
+																		value={
+																			option
+																		}
+																		key={
+																			option
+																		}
+																	>
+																		{option}
+																	</SelectItem>
+																),
+															)}
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="ethnicity"
+										render={({ field }) => (
+											<FormItem className="">
+												<FormLabel>
+													{formatRegistrationField(
+														"Ethnicity",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
+													}
+													defaultValue={field.value}
+												>
+													<FormControl>
+														<SelectTrigger className="w-full placeholder:text-muted-foreground">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
+															>
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select a ${capitalizeFirstLetter(field.name)}`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														<SelectGroup>
+															{c.registration.ethnicityOptions.map(
+																(option) => (
+																	<SelectItem
+																		value={
+																			option
+																		}
+																		key={
+																			option
+																		}
+																	>
+																		{option}
+																	</SelectItem>
+																),
+															)}
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="countryOfResidence"
+										render={({ field }) => (
+											<FormItem className="grid-cols-2">
+												<FormLabel>
+													{formatRegistrationField(
+														"Country of Residence",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Popover>
+													<PopoverTrigger asChild>
+														<FormControl>
+															<Button
+																variant="outline"
+																role="combobox"
+																className={cn(
+																	"w-full justify-between",
+																	!field.value &&
+																		"text-muted-foreground",
+																)}
+															>
+																<p className="truncate whitespace-nowrap">
+																	{field.value
+																		? c.registration.countries.find(
+																				(
+																					selectedCountry,
+																				) =>
+																					selectedCountry.code ===
+																					field.value,
+																			)
+																				?.name
+																		: "Select a Country"}
+																</p>
+
+																<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+															</Button>
+														</FormControl>
+													</PopoverTrigger>
+													<PopoverContent className="no-scrollbar max-h-[400px] w-[250px] overflow-y-auto p-0">
+														<Command>
+															<CommandInput placeholder="Search countries..." />
+															<CommandList>
+																<CommandEmpty>
+																	No country
+																	found.
+																</CommandEmpty>
+																<CommandGroup>
+																	{c.registration.countries.map(
+																		(
+																			country,
+																		) => (
+																			<CommandItem
+																				value={
+																					country.name
+																				}
+																				key={
+																					country.name
+																				}
+																				onSelect={(
+																					_,
+																				) => {
+																					const countryResult =
+																						c.registration.countries.find(
+																							(
+																								countryObject,
+																							) =>
+																								countryObject.name ===
+																								country.name,
+																						);
+																					field.onChange(
+																						countryResult?.code ??
+																							"00",
+																					);
+																				}}
+																				className="cursor-pointer"
+																			>
+																				<Check
+																					className={`mr-2 h-4 w-4 ${
+																						country.name.toLowerCase() ===
+																						field.value
+																							? "block"
+																							: "hidden"
+																					} `}
+																				/>
+																				{
+																					country.name
+																				}
+																			</CommandItem>
+																		),
+																	)}
+																</CommandGroup>
+															</CommandList>
+														</Command>
+													</PopoverContent>
+												</Popover>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+							</FormGroupWrapper>
+							<FormGroupWrapper title="MLH">
+								<FormField
+									control={form.control}
+									name="hasAcceptedMLHCoC"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
 											<FormControl>
-												<SelectTrigger className="w-full">
-													<SelectValue placeholder="Select a Gender" />
-												</SelectTrigger>
+												<Checkbox
+													checked={field.value}
+													onCheckedChange={
+														field.onChange
+													}
+												/>
 											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="MALE">
-														Male
-													</SelectItem>
-													<SelectItem value="FEMALE">
-														Female
-													</SelectItem>
-													<SelectItem value="NON-BINARY">
-														Non-binary
-													</SelectItem>
-													<SelectItem value="OTHER">
-														Other
-													</SelectItem>
-													<SelectItem value="PREFERNOTSAY">
-														Prefer not to say
-													</SelectItem>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="race"
-								render={({ field }) => (
-									<FormItem className="">
-										<FormLabel>Race</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
+											<div className="space-y-1 leading-none">
+												<FormLabel>
+													I accept the{" "}
+													<Link
+														target="_blank"
+														className="underline"
+														href={
+															"https://mlh.io/code-of-conduct"
+														}
+													>
+														MLH Code of Conduct
+													</Link>
+													{" *"}
+												</FormLabel>
+											</div>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="hasSharedDataWithMLH"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
 											<FormControl>
-												<SelectTrigger className="w-full">
-													<SelectValue placeholder="Select a Race" />
-												</SelectTrigger>
+												<Checkbox
+													checked={field.value}
+													onCheckedChange={
+														field.onChange
+													}
+												/>
 											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													{c.registration.raceOptions.map(
-														(option) => (
-															<SelectItem
-																value={option}
-																key={option}
-															>
-																{option}
-															</SelectItem>
-														),
-													)}
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="ethnicity"
-								render={({ field }) => (
-									<FormItem className="">
-										<FormLabel>Ethnicity</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
+											<div className="space-y-1 leading-none">
+												<FormLabel>
+													I authorize you to share my
+													application/registration
+													information with Major
+													League Hacking for event
+													administration, ranking, and
+													MLH administration in-line
+													with the MLH Privacy Policy.
+													I further agree to the terms
+													of both the{" "}
+													<Link
+														target="_blank"
+														className="underline"
+														href={
+															"https://github.com/MLH/mlh-policies/blob/main/contest-terms.md"
+														}
+													>
+														MLH Contest Terms and
+														Conditions
+													</Link>{" "}
+													and the{" "}
+													<Link
+														target="_blank"
+														className="underline"
+														href={
+															"https://mlh.io/privacy"
+														}
+													>
+														MLH Privacy Policy
+													</Link>
+													. *
+												</FormLabel>
+											</div>
+										</FormItem>
+									)}
+								/>
+								<FormField
+									control={form.control}
+									name="isEmailable"
+									render={({ field }) => (
+										<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
 											<FormControl>
-												<SelectTrigger className="w-full placeholder:text-muted-foreground">
-													<SelectValue placeholder="Select a Ethnicity" />
-												</SelectTrigger>
+												<Checkbox
+													checked={field.value}
+													onCheckedChange={
+														field.onChange
+													}
+												/>
 											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="Hispanic or Latino">
-														Hispanic or Latino
-													</SelectItem>
-													<SelectItem value="Not Hispanic or Latino">
-														Not Hispanic or Latino
-													</SelectItem>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="countryOfResidence"
-								render={({ field }) => (
-									<FormItem className="grid-cols-2">
-										<FormLabel>
-											Country of Residence
-										</FormLabel>
-										<div className="flex w-full items-center justify-center">
-											<Popover>
-												<PopoverTrigger asChild>
-													<FormControl>
-														<Button
-															variant="outline"
-															role="combobox"
-															className={cn(
-																"w-full justify-between",
-																!field.value &&
-																	"text-muted-foreground",
-															)}
-														>
-															{field.value
-																? c.registration.countries.find(
+											<div className="space-y-1 leading-none">
+												<FormLabel>
+													I authorize MLH to send me
+													an email where I can further
+													opt into the MLH Hacker,
+													Events, or Organizer
+													Newsletters and other
+													communications from MLH.
+												</FormLabel>
+											</div>
+										</FormItem>
+									)}
+								/>
+							</FormGroupWrapper>
+							<FormGroupWrapper title="University Info">
+								<div
+									className={`grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-4 lg:grid-cols-7`}
+								>
+									<FormField
+										control={form.control}
+										name="university"
+										render={({ field }) => (
+											<FormItem
+												className={`col-span-2 ${!isLocalUniversitySelected && "lg:col-span-3"} flex flex-col`}
+											>
+												<FormLabel>
+													{formatRegistrationField(
+														"University",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Popover>
+													<PopoverTrigger asChild>
+														<FormControl>
+															<Button
+																variant="outline"
+																role="combobox"
+																className={cn(
+																	"w-full justify-between",
+																	!field.value &&
+																		"text-muted-foreground",
+																)}
+															>
+																<p className="truncate whitespace-nowrap">
+																	{field.value
+																		? c.registration.schools.find(
+																				(
+																					school,
+																				) =>
+																					school ===
+																					field.value,
+																			)
+																		: "Select a University"}
+																</p>
+
+																<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+															</Button>
+														</FormControl>
+													</PopoverTrigger>
+													<PopoverContent className="no-scrollbar max-h-[400px] w-[250px] overflow-y-auto p-0">
+														<Command>
+															<CommandInput placeholder="Search university..." />
+															<CommandList>
+																<CommandEmpty>
+																	No
+																	university
+																	found.
+																</CommandEmpty>
+																<CommandGroup>
+																	{c.registration.schools.map(
 																		(
-																			selectedCountry,
-																		) =>
-																			selectedCountry.code ===
-																			field.value,
-																	)?.name
-																: "Select a Country"}
-															<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-														</Button>
-													</FormControl>
-												</PopoverTrigger>
-												<PopoverContent className="no-scrollbar max-h-[400px] w-[250px] overflow-y-auto p-0">
-													<Command>
-														<CommandInput placeholder="Search countries..." />
-														<CommandList>
-															<CommandEmpty>
-																No country
-																found.
-															</CommandEmpty>
-															<CommandGroup>
-																{c.registration.countries.map(
-																	(
-																		country,
-																	) => (
-																		<CommandItem
-																			value={
-																				country.name
-																			}
-																			key={
-																				country.name
-																			}
-																			onSelect={(
-																				_,
-																			) => {
-																				const countryResult =
-																					c.registration.countries.find(
-																						(
-																							countryObject,
-																						) =>
-																							countryObject.name ===
-																							country.name,
+																			school,
+																		) => (
+																			<CommandItem
+																				value={
+																					school
+																				}
+																				key={
+																					school
+																				}
+																				onSelect={(
+																					value,
+																				) => {
+																					field.onChange(
+																						value,
 																					);
-																				form.setValue(
-																					"countryOfResidence",
-																					countryResult?.code ??
-																						"00",
-																				);
-																			}}
-																			className="cursor-pointer"
-																		>
-																			<Check
-																				className={`mr-2 h-4 w-4 ${
-																					country.name.toLowerCase() ===
-																					field.value
-																						? "block"
-																						: "hidden"
-																				} `}
-																			/>
-																			{
-																				country.name
-																			}
-																		</CommandItem>
-																	),
-																)}
-															</CommandGroup>
-														</CommandList>
-													</Command>
-												</PopoverContent>
-											</Popover>
-										</div>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-					</FormGroupWrapper>
-					<FormGroupWrapper title="MLH">
-						<FormField
-							control={form.control}
-							name="hasAcceptedMLHCoC"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
-									<FormControl>
-										<Checkbox
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<div className="space-y-1 leading-none">
-										<FormLabel>
-											I accept the{" "}
-											<Link
-												target="_blank"
-												className="underline"
-												href={
-													"https://mlh.io/code-of-conduct"
-												}
-											>
-												MLH Code of Conduct
-											</Link>
-										</FormLabel>
-										<FormDescription>
-											This is required of all attendees.
-										</FormDescription>
-									</div>
-								</FormItem>
-							)}
-						/>
-						<FormField
-							control={form.control}
-							name="hasSharedDataWithMLH"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
-									<FormControl>
-										<Checkbox
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<div className="space-y-1 leading-none">
-										<FormLabel>
-											I authorize you to share my
-											application/registration information
-											with Major League Hacking for event
-											administration, ranking, and MLH
-											administration in-line with the MLH
-											Privacy Policy. I further agree to
-											the terms of both the{" "}
-											<Link
-												target="_blank"
-												className="underline"
-												href={
-													"https://github.com/MLH/mlh-policies/blob/main/contest-terms.md"
-												}
-											>
-												MLH Contest Terms and Conditions
-											</Link>{" "}
-											and the{" "}
-											<Link
-												target="_blank"
-												className="underline"
-												href={"https://mlh.io/privacy"}
+																				}}
+																				className="cursor-pointer"
+																			>
+																				<Check
+																					className={`mr-2 h-4 w-4 ${
+																						school.toLowerCase() ===
+																						field.value
+																							? "block"
+																							: "hidden"
+																					} `}
+																				/>
+																				{
+																					school
+																				}
+																			</CommandItem>
+																		),
+																	)}
+																</CommandGroup>
+															</CommandList>
+														</Command>
+													</PopoverContent>
+												</Popover>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="schoolID"
+										render={({ field }) => (
+											<FormItem
+												className={`${
+													isLocalUniversitySelected
+														? "col-span-1 flex flex-col md:col-span-2 lg:col-span-1"
+														: "hidden"
+												}`}
 											>
-												MLH Privacy Policy
-											</Link>
-											.
-										</FormLabel>
-										<FormDescription>
-											This is required of all attendees.
-										</FormDescription>
-									</div>
-								</FormItem>
-							)}
-						/>
-						<FormField
-							control={form.control}
-							name="isEmailable"
-							render={({ field }) => (
-								<FormItem className="flex flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
-									<FormControl>
-										<Checkbox
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<div className="space-y-1 leading-none">
-										<FormLabel>
-											I authorize MLH to send me an email
-											where I can further opt into the MLH
-											Hacker, Events, or Organizer
-											Newsletters and other communications
-											from MLH.
-										</FormLabel>
-										<FormDescription>
-											This is optional.
-										</FormDescription>
-									</div>
-								</FormItem>
-							)}
-						/>
-					</FormGroupWrapper>
-					<FormGroupWrapper title="University Info">
-						<div
-							className={`grid ${
-								universityValue ===
-								c.localUniversityName.toLowerCase()
-									? "grid-cols-1 md:grid-cols-6"
-									: "grid-cols-1 md:grid-cols-5"
-							} gap-x-2 gap-y-4`}
-						>
-							<FormField
-								control={form.control}
-								name="university"
-								render={({ field }) => (
-									<FormItem className="col-span-2 flex flex-col">
-										<FormLabel>University</FormLabel>
-										<Popover>
-											<PopoverTrigger asChild>
+												<FormLabel>
+													{formatRegistrationField(
+														`${c.localUniversitySchoolIDName}`,
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
 												<FormControl>
-													<Button
-														variant="outline"
-														role="combobox"
-														className={cn(
-															"w-full justify-between",
-															!field.value &&
-																"text-muted-foreground",
-														)}
-													>
-														{field.value
-															? c.registration.schools.find(
-																	(school) =>
-																		school ===
-																		field.value,
-																)
-															: "Select a University"}
-														<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-													</Button>
+													<Input
+														placeholder={
+															c.localUniversitySchoolIDName
+														}
+														{...field}
+													/>
 												</FormControl>
-											</PopoverTrigger>
-											<PopoverContent className="no-scrollbar max-h-[400px] w-[250px] overflow-y-auto p-0">
-												<Command>
-													<CommandInput placeholder="Search university..." />
-													<CommandList>
-														<CommandEmpty>
-															No university found.
-														</CommandEmpty>
-														<CommandGroup>
-															{c.registration.schools.map(
-																(school) => (
-																	<CommandItem
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="levelOfStudy"
+										render={({ field }) => (
+											<FormItem
+												className={`col-span-2 ${isLocalUniversitySelected ? "md:col-span-2" : "md:col-span-1 lg:col-span-2"} flex flex-col`}
+											>
+												<FormLabel>
+													{formatRegistrationField(
+														"Level of Study",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
+													}
+													defaultValue={field.value}
+												>
+													<FormControl>
+														<SelectTrigger className="w-full placeholder:text-muted-foreground">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
+															>
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select an Option`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														<SelectGroup className="max-h-[400px] w-[calc(var(--radix-select-trigger-width)+10rem)] overflow-y-scroll">
+															{c.registration.levelsOfStudy.map(
+																(level) => (
+																	<SelectItem
 																		value={
-																			school
+																			level
 																		}
 																		key={
-																			school
+																			level
 																		}
-																		onSelect={(
-																			value,
-																		) => {
-																			form.setValue(
-																				"university",
-																				value,
-																			);
-																		}}
-																		className="cursor-pointer"
 																	>
-																		<Check
-																			className={`mr-2 h-4 w-4 ${
-																				school.toLowerCase() ===
-																				field.value
-																					? "block"
-																					: "hidden"
-																			} `}
-																		/>
-																		{school}
-																	</CommandItem>
+																		{level}
+																	</SelectItem>
 																),
 															)}
-														</CommandGroup>
-													</CommandList>
-												</Command>
-											</PopoverContent>
-										</Popover>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="major"
-								render={({ field }) => (
-									<FormItem className="col-span-2 flex flex-col">
-										<FormLabel>Major</FormLabel>
-										<Popover>
-											<PopoverTrigger asChild>
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+
+									<FormField
+										control={form.control}
+										name="major"
+										render={({ field }) => (
+											<FormItem
+												className={`col-span-2 flex flex-col ${isLocalUniversitySelected ? "md:col-span-2" : "md:col-span-1 lg:col-span-2"}`}
+											>
+												<FormLabel>
+													{formatRegistrationField(
+														"Major",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Popover>
+													<PopoverTrigger asChild>
+														<FormControl>
+															<Button
+																variant="outline"
+																role="combobox"
+																className={cn(
+																	"w-full justify-between",
+																	!field.value &&
+																		"text-muted-foreground",
+																)}
+															>
+																<p className="truncate whitespace-nowrap">
+																	{field.value
+																		? c.registration.majors.find(
+																				(
+																					major,
+																				) =>
+																					major ===
+																					field.value,
+																			)
+																		: "Select a Major"}
+																</p>
+
+																<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+															</Button>
+														</FormControl>
+													</PopoverTrigger>
+													<PopoverContent className="no-scrollbar max-h-[400px] w-[250px] overflow-y-auto p-0">
+														<Command>
+															<CommandInput placeholder="Search major..." />
+															<CommandList className="">
+																<CommandEmpty>
+																	No major
+																	found.
+																</CommandEmpty>
+																<CommandGroup>
+																	{c.registration.majors.map(
+																		(
+																			major,
+																		) => (
+																			<CommandItem
+																				value={
+																					major
+																				}
+																				key={
+																					major
+																				}
+																				onSelect={(
+																					value,
+																				) => {
+																					field.onChange(
+																						value,
+																					);
+																				}}
+																				className="cursor-pointer"
+																			>
+																				<Check
+																					className={`mr-2 h-4 w-4 overflow-hidden ${
+																						major.toLowerCase() ===
+																						field.value
+																							? "block"
+																							: "hidden"
+																					} `}
+																				/>
+																				{
+																					major
+																				}
+																			</CommandItem>
+																		),
+																	)}
+																</CommandGroup>
+															</CommandList>
+														</Command>
+													</PopoverContent>
+												</Popover>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+							</FormGroupWrapper>
+							<FormGroupWrapper title="Hackathon Experience">
+								<div className="grid grid-cols-1 gap-x-2 gap-y-2 md:grid-cols-3 md:gap-y-0">
+									<FormField
+										control={form.control}
+										name="hackathonsAttended"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"# of hackathons attended",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
 												<FormControl>
-													<Button
-														variant="outline"
-														role="combobox"
-														className={cn(
-															"w-full justify-between",
-															!field.value &&
-																"text-muted-foreground",
-														)}
-													>
-														{field.value
-															? c.registration.majors.find(
-																	(major) =>
-																		major ===
-																		field.value,
-																)
-															: "Select a Major"}
-														<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-													</Button>
+													<Input
+														type="number"
+														{...field}
+													/>
 												</FormControl>
-											</PopoverTrigger>
-											<PopoverContent className="no-scrollbar max-h-[400px] w-[250px] overflow-y-auto p-0">
-												<Command>
-													<CommandInput placeholder="Search major..." />
-													<CommandList>
-														<CommandEmpty>
-															No major found.
-														</CommandEmpty>
-														<CommandGroup>
-															{c.registration.majors.map(
-																(major) => (
-																	<CommandItem
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="softwareExperience"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Coding Experience",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
+													}
+													defaultValue={field.value}
+												>
+													<FormControl>
+														<SelectTrigger className="placeholder:text-muted-foreground">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
+															>
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select an Option`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														<SelectGroup className="max-h-[400px] w-[var(--radix-select-trigger-width)]">
+															{c.registration.softwareExperienceOptions.map(
+																(option) => (
+																	<SelectItem
 																		value={
-																			major
+																			option
 																		}
 																		key={
-																			major
+																			option
 																		}
-																		onSelect={(
-																			value,
-																		) => {
-																			form.setValue(
-																				"major",
-																				value,
-																			);
-																		}}
-																		className="cursor-pointer"
 																	>
-																		<Check
-																			className={`mr-2 h-4 w-4 overflow-hidden ${
-																				major.toLowerCase() ===
-																				field.value
-																					? "block"
-																					: "hidden"
-																			} `}
-																		/>
-																		{major}
-																	</CommandItem>
+																		{option}
+																	</SelectItem>
 																),
 															)}
-														</CommandGroup>
-													</CommandList>
-												</Command>
-											</PopoverContent>
-										</Popover>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="levelOfStudy"
-								render={({ field }) => (
-									<FormItem className="col-span-2 flex flex-col md:col-span-1">
-										<FormLabel>Level of Study</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
-											<FormControl>
-												<SelectTrigger className="w-full placeholder:text-muted-foreground">
-													<SelectValue placeholder="Level of Study" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="Freshman">
-														Freshman
-													</SelectItem>
-													<SelectItem value="Sophomore">
-														Sophomore
-													</SelectItem>
-													<SelectItem value="Junior">
-														Junior
-													</SelectItem>
-													<SelectItem value="Senior">
-														Senior
-													</SelectItem>
-													<SelectItem value="Recent Grad">
-														Recent Grad
-													</SelectItem>
-													<SelectItem value="Other">
-														Other
-													</SelectItem>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="schoolID"
-								render={({ field }) => (
-									<FormItem
-										className={`${
-											universityValue ===
-											c.localUniversityName
-												? "col-span-2 flex flex-col md:col-span-1"
-												: "hidden"
-										}`}
-									>
-										<FormLabel>
-											{c.localUniversitySchoolIDName}
-										</FormLabel>
-										<FormControl>
-											<Input
-												placeholder={
-													c.localUniversitySchoolIDName
-												}
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-					</FormGroupWrapper>
-					<FormGroupWrapper title="Hackathon Experience">
-						<div className="grid grid-cols-1 gap-x-2 gap-y-2 md:grid-cols-3 md:gap-y-0">
-							<FormField
-								control={form.control}
-								name="hackathonsAttended"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>
-											# of Hackathons Attended
-										</FormLabel>
-										<FormControl>
-											<Input type="number" {...field} />
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="softwareBuildingExperience"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>
-											Software Building Experience
-										</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
-											<FormControl>
-												<SelectTrigger className="w-full placeholder:text-muted-foreground">
-													<SelectValue placeholder="Experience Level" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="Beginner">
-														Beginner
-													</SelectItem>
-													<SelectItem value="Intermediate">
-														Intermediate
-													</SelectItem>
-													<SelectItem value="Advanced">
-														Advanced
-													</SelectItem>
-													<SelectItem value="Expert">
-														Expert
-													</SelectItem>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="heardAboutEvent"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>
-											Where did you hear about{" "}
-											{c.hackathonName}?
-										</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
-											<FormControl>
-												<SelectTrigger className="w-full placeholder:text-muted-foreground">
-													<SelectValue placeholder="Heard From..." />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="Instagram">
-														Instagram
-													</SelectItem>
-													<SelectItem value="Class Presentation">
-														Class Presentation
-													</SelectItem>
-													<SelectItem value="Twitter">
-														Twitter
-													</SelectItem>
-													<SelectItem value="Event Site">
-														Event Site
-													</SelectItem>
-													<SelectItem value="Friend">
-														Friend
-													</SelectItem>
-													<SelectItem value="Other">
-														Other
-													</SelectItem>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-					</FormGroupWrapper>
-					<FormGroupWrapper title="Day of Event">
-						<div className="grid grid-cols-1 gap-x-4 gap-y-2 pb-5 md:grid-cols-2 md:gap-y-0">
-							<FormField
-								control={form.control}
-								name="shirtSize"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Shirt Size</FormLabel>
-										<Select
-											onValueChange={field.onChange}
-											defaultValue={field.value}
-										>
-											<FormControl>
-												<SelectTrigger className="w-full placeholder:text-muted-foreground">
-													<SelectValue placeholder="Shirt Size" />
-												</SelectTrigger>
-											</FormControl>
-											<SelectContent>
-												<SelectGroup>
-													<SelectItem value="S">
-														S
-													</SelectItem>
-													<SelectItem value="M">
-														M
-													</SelectItem>
-													<SelectItem value="L">
-														L
-													</SelectItem>
-													<SelectItem value="XL">
-														XL
-													</SelectItem>
-													<SelectItem value="2XL">
-														2XL
-													</SelectItem>
-													<SelectItem value="3XL">
-														3XL
-													</SelectItem>
-												</SelectGroup>
-											</SelectContent>
-										</Select>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="dietaryRestrictions"
-								render={() => (
-									<FormItem className="row-span-2">
-										<div className="mb-4">
-											<FormLabel className="text-base">
-												Dietary Restrictions
-											</FormLabel>
-											<FormDescription>
-												Please select which dietary
-												restrictions you have so we can
-												best accomodate you at the
-												event!
-											</FormDescription>
-										</div>
-										{c.registration.dietaryRestrictionOptions.map(
-											(item) => (
-												<FormField
-													key={item}
-													control={form.control}
-													name="dietaryRestrictions"
-													render={({ field }) => {
-														return (
-															<FormItem
-																key={item}
-																className="flex flex-row items-start space-x-3 space-y-0"
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="heardFrom"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														`Where did you hear about ${c.hackathonName}?`,
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
+													}
+													defaultValue={field.value}
+												>
+													<FormControl>
+														<SelectTrigger className="w-full placeholder:text-muted-foreground">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
 															>
-																<FormControl>
-																	<Checkbox
-																		checked={field.value?.includes(
-																			item,
-																		)}
-																		onCheckedChange={(
-																			checked,
-																		) => {
-																			return checked
-																				? field.onChange(
-																						[
-																							...field.value,
-																							item,
-																						],
-																					)
-																				: field.onChange(
-																						field.value?.filter(
-																							(
-																								value,
-																							) =>
-																								value !==
-																								item,
-																						),
-																					);
-																		}}
-																	/>
-																</FormControl>
-																<FormLabel className="font-normal">
-																	{item}
-																</FormLabel>
-															</FormItem>
-														);
-													}}
-												/>
-											),
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select an Option`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														<SelectGroup className="max-h-[400px] w-[var(--radix-select-trigger-width)]">
+															{c.registration.heardFromOptions.map(
+																(option) => (
+																	<SelectItem
+																		value={
+																			option
+																		}
+																		key={
+																			option
+																		}
+																	>
+																		{option}
+																	</SelectItem>
+																),
+															)}
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
 										)}
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="accommodationNote"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>
-											Anything else we can do to better
-											accommodate you at our hackathon?
-										</FormLabel>
-										<FormControl>
-											<Textarea
-												placeholder="List any accessibility concerns here..."
-												className="h-[80%] resize-none"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-					</FormGroupWrapper>
-					<FormGroupWrapper title="Career Info">
-						<div className="grid grid-cols-1 gap-x-2 gap-y-2 md:grid-cols-3 md:gap-y-2">
-							<FormField
-								control={form.control}
-								name="github"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>GitHub Username</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="Username"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="linkedin"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Linkedin Username</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="Username"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="personalWebsite"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Personal Website</FormLabel>
-										<FormControl>
-											<Input
-												placeholder="https://example.com/"
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<FormField
-							control={form.control}
-							name="personalWebsite"
-							render={({ field }) => (
-								<FormItem>
-									<FormLabel>Resume</FormLabel>
-									<FormControl>
-										<div
-											{...getRootProps()}
-											className={`border-2${
-												uploadedFile
-													? ""
-													: "cursor-pointer"
-											} flex min-h-[200px] flex-col items-center justify-center rounded-lg border-dashed border-white`}
-										>
-											<input {...getInputProps()} />
-											<p className="p-2 text-center">
-												{uploadedFile ? (
-													`${uploadedFile.name} (${Math.round(uploadedFile.size / 1024)}kb)`
-												) : isDragActive ? (
-													"Drop your resume here..."
-												) : (
-													<div>
-														Drag 'n' drop your
-														resume here, or click to
-														select a file
-														<br />
-														Accepted files: PDF
-													</div>
-												)}
-											</p>
-											{uploadedFile ? (
-												<Button
-													className="mt-4"
-													onClick={() =>
-														setUploadedFile(null)
+									/>
+								</div>
+							</FormGroupWrapper>
+							<FormGroupWrapper title="Day of Event">
+								<div className="mt-0 grid grid-cols-1 gap-x-4 gap-y-2 pb-20 md:grid-cols-2 md:gap-y-0">
+									<FormField
+										control={form.control}
+										name="shirtSize"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Shirt Size",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<Select
+													onValueChange={
+														field.onChange
 													}
+													defaultValue={field.value}
 												>
-													Remove
-												</Button>
-											) : null}
-										</div>
-									</FormControl>
-									<FormMessage />
-								</FormItem>
-							)}
-						/>
-					</FormGroupWrapper>
-					<FormGroupWrapper title="Hacker Profile">
-						<div className="grid grid-cols-1 gap-x-2 gap-y-2 md:grid-cols-3 md:gap-y-0">
-							<FormField
-								control={form.control}
-								name="hackerTag"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>HackerTag</FormLabel>
-										<FormControl>
-											<div className="flex">
-												<div className="flex h-10 w-10 items-center justify-center rounded-l bg-accent text-lg font-light text-primary">
-													@
+													<FormControl>
+														<SelectTrigger className="w-full">
+															<div
+																className={clsx(
+																	"flex w-[95%] justify-start",
+																	{
+																		"text-muted-foreground":
+																			!field.value,
+																	},
+																)}
+															>
+																<p className="overflow-hidden text-ellipsis whitespace-nowrap">
+																	{field.value ||
+																		`Select a Shirt Size`}
+																</p>
+															</div>
+														</SelectTrigger>
+													</FormControl>
+													<SelectContent>
+														<SelectGroup>
+															{c.registration.shirtSizeOptions.map(
+																(option) => (
+																	<SelectItem
+																		value={
+																			option
+																		}
+																		key={
+																			option
+																		}
+																	>
+																		{option}
+																	</SelectItem>
+																),
+															)}
+														</SelectGroup>
+													</SelectContent>
+												</Select>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="dietRestrictions"
+										render={({ field }) => (
+											<FormItem className="row-span-2">
+												<div className="mb-4">
+													<FormLabel className="text-base">
+														{formatRegistrationField(
+															"Dietary Restrictions",
+															hackerRegistrationFormValidator.shape[
+																field.name
+															].isOptional(),
+														)}
+													</FormLabel>
+													<FormDescription>
+														Please select which
+														dietary restrictions you
+														have so we can best
+														accommodate you at the
+														event!
+													</FormDescription>
 												</div>
-												<Input
-													className="rounded-l-none"
-													placeholder={`${c.hackathonName.toLowerCase()}`}
-													{...field}
+												{c.registration.dietaryRestrictionOptions.map(
+													(item) => (
+														<FormField
+															key={item}
+															control={
+																form.control
+															}
+															name="dietRestrictions"
+															render={({
+																field,
+															}) => {
+																return (
+																	<FormItem
+																		key={
+																			item
+																		}
+																		className="flex flex-row items-start space-x-3 space-y-0"
+																	>
+																		<FormControl>
+																			<Checkbox
+																				checked={field.value?.includes(
+																					item,
+																				)}
+																				onCheckedChange={(
+																					checked,
+																				) => {
+																					return checked
+																						? field.onChange(
+																								[
+																									...(field?.value ??
+																										[]),
+																									item,
+																								],
+																							)
+																						: field.onChange(
+																								field.value?.filter(
+																									(
+																										value,
+																									) =>
+																										value !==
+																										item,
+																								),
+																							);
+																				}}
+																			/>
+																		</FormControl>
+																		<FormLabel className="font-normal">
+																			{
+																				item
+																			}
+																		</FormLabel>
+																	</FormItem>
+																);
+															}}
+														/>
+													),
+												)}
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="accommodationNote"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Anything else we can do to better accommodate you at our hackathon?",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Textarea
+														placeholder="List any accessibility concerns here..."
+														className="h-[80%] resize-none"
+														{...field}
+														value={field.value}
+														onChange={
+															field.onChange
+														}
+													/>
+												</FormControl>
+												<FormDescription>
+													<span
+														className={
+															(field.value
+																?.length ?? 0) >
+															c.registration
+																.maxaccommodationNoteSize
+																? "text-red-800"
+																: ""
+														}
+													>
+														{field.value?.length ??
+															0}{" "}
+														/{" "}
+														{
+															c.registration
+																.maxaccommodationNoteSize
+														}{" "}
+														{""}
+														Characters
+													</span>
+												</FormDescription>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+							</FormGroupWrapper>
+							<FormGroupWrapper title="Career Info">
+								<div className="grid grid-cols-1 gap-x-2 gap-y-2 md:grid-cols-3 md:gap-y-2">
+									<FormField
+										control={form.control}
+										name="GitHub"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"GitHub Username",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder="Username"
+														{...field}
+														value={
+															field.value ??
+															undefined
+														}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="LinkedIn"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"LinkedIn Username",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder="Username"
+														{...field}
+														value={
+															field.value ??
+															undefined
+														}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="PersonalWebsite"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Personal Website",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder="https://example.com/"
+														{...field}
+														value={
+															field.value ??
+															undefined
+														}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+								<FormField
+									control={form.control}
+									name="resumeFile"
+									render={({ field }) => (
+										<FormItem>
+											<FormLabel>
+												{formatRegistrationField(
+													"Resume",
+													hackerRegistrationFormValidator.shape[
+														field.name
+													].isOptional(),
+												)}
+											</FormLabel>
+											<FormControl>
+												<div
+													{...getRootProps()}
+													className={`border-2${
+														uploadedFile
+															? ""
+															: "cursor-pointer"
+													} flex min-h-[200px] flex-col items-center justify-center rounded-lg border-dashed border-white`}
+												>
+													<input
+													type="file"
+														{...getInputProps()}
+													/>
+													<p className="p-2 text-center">
+														{uploadedFile
+															? `${uploadedFile.name} (${Math.round(uploadedFile.size / 1024)}kb)`
+															: isDragActive
+																? "Drop your resume here..."
+																: "Drag 'n' drop your resume here, or click to select a file"}
+													</p>
+													{uploadedFile && (
+														<Button
+															className="mt-4"
+															onClick={() =>
+																setUploadedFile(
+																	null,
+																)
+															}
+														>
+															Remove
+														</Button>
+													)}
+												</div>
+											</FormControl>
+											<FormMessage />
+										</FormItem>
+									)}
+								/>
+							</FormGroupWrapper>
+							<FormGroupWrapper title="Hacker Profile">
+								<div className="grid grid-cols-1 gap-x-2 gap-y-2 md:grid-cols-3 md:gap-y-0">
+									<FormField
+										control={form.control}
+										name="hackerTag"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"HackerTag",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<div className="flex">
+														<div className="flex h-10 w-10 items-center justify-center rounded-l bg-accent text-lg font-light text-primary">
+															@
+														</div>
+														<Input
+															className="rounded-l-none"
+															placeholder={`${c.hackathonName.toLowerCase()}`}
+															{...field}
+														/>
+													</div>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="discord"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Discord UserName",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input
+														placeholder={`${c.hackathonName.toLowerCase()} or ${c.hackathonName.toLowerCase()}#1234`}
+														{...field}
+														value={
+															field.value ??
+															undefined
+														}
+													/>
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="pronouns"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Pronouns",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Input {...field} />
+												</FormControl>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+								<div className="grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-2 md:gap-y-0">
+									<FormField
+										control={form.control}
+										name="bio"
+										render={({ field }) => (
+											<FormItem>
+												<FormLabel>
+													{formatRegistrationField(
+														"Bio",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl>
+													<Textarea
+														placeholder="Hello! I'm..."
+														className="resize-none"
+														{...field}
+													/>
+												</FormControl>
+												<FormDescription>
+													<span
+														className={
+															bioValue.length >
+															c.registration
+																.maxBioSize
+																? "text-red-500"
+																: ""
+														}
+													>
+														{bioValue.length} /{" "}
+														{
+															c.registration
+																.maxBioSize
+														}{" "}
+														{""}
+														Characters
+													</span>
+												</FormDescription>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+									<FormField
+										control={form.control}
+										name="skills"
+										render={({ field }) => (
+											<FormItem className="flex flex-col items-start">
+												<FormLabel className="pb-2 text-left">
+													{formatRegistrationField(
+														"Skills",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormControl className="min-h-[80px]">
+													<TagInput
+														inputFieldPostion="top"
+														{...field}
+														placeholder="Type and then press enter to add a skill..."
+														tags={skills}
+														className="sm:min-w-[450px]"
+														setTags={(newTags) => {
+															setSkills(newTags);
+															field.onChange(
+																newTags as [
+																	Tag,
+																	...Tag[],
+																],
+															);
+														}}
+													/>
+												</FormControl>
+												<FormDescription className="!mt-0">
+													These skills can be listed
+													on your profile and help
+													with the team finding
+													process! Enter anything you
+													think is relevant, including
+													non-technical skills!
+												</FormDescription>
+												<FormMessage />
+											</FormItem>
+										)}
+									/>
+								</div>
+								<FormField
+									control={form.control}
+									name="isSearchable"
+									render={({ field }) => (
+										<FormItem className="mx-auto flex max-w-[600px] flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
+											<FormControl>
+												<Checkbox
+													checked={field.value}
+													onCheckedChange={
+														field.onChange
+													}
 												/>
+											</FormControl>
+											<div className="space-y-1 leading-none">
+												<FormLabel>
+													{formatRegistrationField(
+														"Make my profile searchable by other Hackers",
+														hackerRegistrationFormValidator.shape[
+															field.name
+														].isOptional(),
+													)}
+												</FormLabel>
+												<FormDescription>
+													This will allow other
+													Hackers to look you up by
+													your name or HackerTag.
+													Other Hackers will still be
+													able to view your profile
+													and invite you to teams if
+													they have your link.
+												</FormDescription>
 											</div>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="profileDiscordName"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Discord Username</FormLabel>
-										<FormControl>
-											<Input
-												placeholder={`${c.hackathonName.toLowerCase()} or ${c.hackathonName.toLowerCase()}#1234`}
-												{...field}
-											/>
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="pronouns"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Pronouns</FormLabel>
-										<FormControl>
-											<Input {...field} />
-										</FormControl>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<div className="grid grid-cols-1 gap-x-2 gap-y-4 md:grid-cols-2 md:gap-y-0">
-							<FormField
-								control={form.control}
-								name="bio"
-								render={({ field }) => (
-									<FormItem>
-										<FormLabel>Bio</FormLabel>
-										<FormControl>
-											<Textarea
-												placeholder="Hello! I'm..."
-												className="resize-none"
-												{...field}
-											/>
-										</FormControl>
-										<FormDescription>
-											<span
-												className={
-													bioValue.length > 500
-														? "text-red-500"
-														: ""
-												}
-											>
-												{bioValue.length} / 500
-												Characters
-											</span>
-										</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-							<FormField
-								control={form.control}
-								name="skills"
-								render={({ field }) => (
-									<FormItem className="flex flex-col items-start">
-										<FormLabel className="pb-2 text-left">
-											Skills
-										</FormLabel>
-										<FormControl className="min-h-[80px]">
-											<TagInput
-												inputFieldPostion="top"
-												{...field}
-												placeholder="Type and then press enter to add a skill..."
-												tags={skills}
-												className="sm:min-w-[450px]"
-												setTags={(newTags) => {
-													setSkills(newTags);
-													form.setValue(
-														"skills",
-														newTags as [
-															Tag,
-															...Tag[],
-														],
-													);
-												}}
-											/>
-										</FormControl>
-										<FormDescription className="!mt-0">
-											These skills can be listed on your
-											profile and help with the team
-											finding process! Enter anything you
-											think is relevant, including
-											non-technical skills!
-										</FormDescription>
-										<FormMessage />
-									</FormItem>
-								)}
-							/>
-						</div>
-						<FormField
-							control={form.control}
-							name="profileIsSearchable"
-							render={({ field }) => (
-								<FormItem className="mx-auto flex max-w-[600px] flex-row items-start space-x-3 space-y-0 rounded-md border p-4">
-									<FormControl>
-										<Checkbox
-											checked={field.value}
-											onCheckedChange={field.onChange}
-										/>
-									</FormControl>
-									<div className="space-y-1 leading-none">
-										<FormLabel>
-											Make my profile searchable by other
-											Hackers
-										</FormLabel>
-										<FormDescription>
-											This will allow other Hackers to
-											look you up by your name or
-											HackerTag. Other Hackers will still
-											be able to view your profile and
-											invite you to teams if they have
-											your link.
-										</FormDescription>
-									</div>
-								</FormItem>
+										</FormItem>
+									)}
+								/>
+							</FormGroupWrapper>
+							<Button type="submit">Submit</Button>
+							{hasErrors && (
+								<p className="text-red-800">
+									Something doesn't look right. Please check
+									your inputs.
+								</p>
 							)}
-						/>
-					</FormGroupWrapper>
-					<Button type="submit">Submit</Button>
-					{hasErrors && (
-						<p className="text-red-800">
-							Something doesn't look right. Please check your
-							inputs.
-						</p>
-					)}
-				</form>
-			</Form>
-		</div>
+						</form>
+					</Form>
+				</div>
+			)}
+			<div className="relative">
+				{!!errorMessage && !hasSuccess && (
+					<RegistrationFeedbackAlert
+						hasError={hasErrors}
+						messasge={errorMessage}
+						setErrorMessage={setErrorMessage}
+					/>
+				)}
+			</div>
+		</>
 	);
 }
diff --git a/apps/web/src/components/registration/RegistrationFeedbackAlert.tsx b/apps/web/src/components/registration/RegistrationFeedbackAlert.tsx
new file mode 100644
index 00000000..40d1c922
--- /dev/null
+++ b/apps/web/src/components/registration/RegistrationFeedbackAlert.tsx
@@ -0,0 +1,57 @@
+import { Dispatch, SetStateAction } from "react";
+import {
+	AlertDialog,
+	AlertDialogAction,
+	AlertDialogCancel,
+	AlertDialogContent,
+	AlertDialogDescription,
+	AlertDialogFooter,
+	AlertDialogHeader,
+	AlertDialogTitle,
+	AlertDialogTrigger,
+} from "../shadcn/ui/alert-dialog";
+import { CircleAlert } from "lucide-react";
+
+interface RegistrationFeedbackAlertProps {
+	hasError: boolean;
+	messasge: string;
+	className?: string;
+	setErrorMessage: Dispatch<SetStateAction<string | null>>;
+}
+
+export default function RegistrationFeedbackAlert(
+	props: RegistrationFeedbackAlertProps,
+) {
+	const { hasError, messasge, className, setErrorMessage } = props;
+	return (
+		<AlertDialog
+			onOpenChange={(_) => {
+				setErrorMessage(null);
+			}}
+			open={true}
+		>
+			<AlertDialogTrigger
+				asChild
+				className={`absolute bottom-2 right-0 ${className}`}
+			>
+				<CircleAlert color="red" className="hover:cursor-pointer" />
+			</AlertDialogTrigger>
+			<AlertDialogContent className="w-[90%] sm:w-3/4">
+				<AlertDialogHeader>
+					<AlertDialogTitle asChild>
+						<div className="flex flex-row items-center gap-2">
+							<CircleAlert color="red" />
+							<p>{"An Error Occured."}</p>
+						</div>
+					</AlertDialogTitle>
+					<AlertDialogDescription className="w-full text-start">
+						{messasge}
+					</AlertDialogDescription>
+				</AlertDialogHeader>
+				<AlertDialogFooter>
+					<AlertDialogCancel>Back to Form</AlertDialogCancel>
+				</AlertDialogFooter>
+			</AlertDialogContent>
+		</AlertDialog>
+	);
+}
diff --git a/apps/web/src/components/shadcn/ui/alert-dialog.tsx b/apps/web/src/components/shadcn/ui/alert-dialog.tsx
new file mode 100644
index 00000000..6eddb8ec
--- /dev/null
+++ b/apps/web/src/components/shadcn/ui/alert-dialog.tsx
@@ -0,0 +1,141 @@
+"use client";
+
+import * as React from "react";
+import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog";
+
+import { cn } from "@/lib/utils/client/cn";
+import { buttonVariants } from "@/components/shadcn/ui/button";
+
+const AlertDialog = AlertDialogPrimitive.Root;
+
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
+
+const AlertDialogPortal = AlertDialogPrimitive.Portal;
+
+const AlertDialogOverlay = React.forwardRef<
+	React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
+	React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+	<AlertDialogPrimitive.Overlay
+		className={cn(
+			"fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+			className,
+		)}
+		{...props}
+		ref={ref}
+	/>
+));
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName;
+
+const AlertDialogContent = React.forwardRef<
+	React.ElementRef<typeof AlertDialogPrimitive.Content>,
+	React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content>
+>(({ className, ...props }, ref) => (
+	<AlertDialogPortal>
+		<AlertDialogOverlay />
+		<AlertDialogPrimitive.Content
+			ref={ref}
+			className={cn(
+				"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+				className,
+			)}
+			{...props}
+		/>
+	</AlertDialogPortal>
+));
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
+
+const AlertDialogHeader = ({
+	className,
+	...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+	<div
+		className={cn(
+			"flex flex-col space-y-2 text-center sm:text-left",
+			className,
+		)}
+		{...props}
+	/>
+);
+AlertDialogHeader.displayName = "AlertDialogHeader";
+
+const AlertDialogFooter = ({
+	className,
+	...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+	<div
+		className={cn(
+			"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+			className,
+		)}
+		{...props}
+	/>
+);
+AlertDialogFooter.displayName = "AlertDialogFooter";
+
+const AlertDialogTitle = React.forwardRef<
+	React.ElementRef<typeof AlertDialogPrimitive.Title>,
+	React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+	<AlertDialogPrimitive.Title
+		ref={ref}
+		className={cn("text-lg font-semibold", className)}
+		{...props}
+	/>
+));
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
+
+const AlertDialogDescription = React.forwardRef<
+	React.ElementRef<typeof AlertDialogPrimitive.Description>,
+	React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+	<AlertDialogPrimitive.Description
+		ref={ref}
+		className={cn("text-sm text-muted-foreground", className)}
+		{...props}
+	/>
+));
+AlertDialogDescription.displayName =
+	AlertDialogPrimitive.Description.displayName;
+
+const AlertDialogAction = React.forwardRef<
+	React.ElementRef<typeof AlertDialogPrimitive.Action>,
+	React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
+>(({ className, ...props }, ref) => (
+	<AlertDialogPrimitive.Action
+		ref={ref}
+		className={cn(buttonVariants(), className)}
+		{...props}
+	/>
+));
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
+
+const AlertDialogCancel = React.forwardRef<
+	React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
+	React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel>
+>(({ className, ...props }, ref) => (
+	<AlertDialogPrimitive.Cancel
+		ref={ref}
+		className={cn(
+			buttonVariants({ variant: "outline" }),
+			"mt-2 sm:mt-0",
+			className,
+		)}
+		{...props}
+	/>
+));
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName;
+
+export {
+	AlertDialog,
+	AlertDialogPortal,
+	AlertDialogOverlay,
+	AlertDialogTrigger,
+	AlertDialogContent,
+	AlertDialogHeader,
+	AlertDialogFooter,
+	AlertDialogTitle,
+	AlertDialogDescription,
+	AlertDialogAction,
+	AlertDialogCancel,
+};
diff --git a/apps/web/src/lib/constants/index.ts b/apps/web/src/lib/constants/index.ts
index b239662a..1900ea66 100644
--- a/apps/web/src/lib/constants/index.ts
+++ b/apps/web/src/lib/constants/index.ts
@@ -1,2 +1,6 @@
+import c from "config";
 export const ONE_HOUR_IN_MILLISECONDS = 3600000;
 export const VERCEL_IP_TIMEZONE_HEADER_KEY = "x-vercel-ip-timezone";
+export const PHONE_NUMBER_REGEX = /^(\+\d{1,2}\s?)?\(?\d{3}\)?\s?[\s.-]?\s?\d{3}\s?[\s.-]?\s?\d{4}$/gm;
+export const DUPLICATE_KEY_ERROR_CODE = '23505';
+export const UNIQUE_KEY_MAPPER_DEFAULT_KEY = 'default' as keyof typeof c.db.UniqueKeyMapper;
\ No newline at end of file
diff --git a/apps/web/src/lib/types/index.ts b/apps/web/src/lib/types/index.ts
index 1784004f..891b0af6 100644
--- a/apps/web/src/lib/types/index.ts
+++ b/apps/web/src/lib/types/index.ts
@@ -1 +1,2 @@
 export * from "./events";
+
diff --git a/apps/web/src/lib/utils/client/shared.ts b/apps/web/src/lib/utils/client/shared.ts
index 5f5f516f..f4227eaf 100644
--- a/apps/web/src/lib/utils/client/shared.ts
+++ b/apps/web/src/lib/utils/client/shared.ts
@@ -1,3 +1,14 @@
 export function getClientTimeZone(vercelIPTimeZone: string | null) {
 	return vercelIPTimeZone ?? Intl.DateTimeFormat().resolvedOptions().timeZone;
 }
+
+export function formatRegistrationField(
+	fieldName: string,
+	isOptional: boolean,
+) {
+	return `${fieldName}${!isOptional ? " *" : ""}`;
+}
+
+export function capitalizeFirstLetter(string: string) {
+	return string.charAt(0).toUpperCase() + string.slice(1);
+}
diff --git a/apps/web/src/lib/utils/shared/types.ts b/apps/web/src/lib/utils/shared/types.ts
deleted file mode 100644
index c029cd54..00000000
--- a/apps/web/src/lib/utils/shared/types.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type DeArray<T> = T extends (infer R)[] ? R : T;
diff --git a/apps/web/src/validators/shared/RegisterForm.ts b/apps/web/src/validators/shared/RegisterForm.ts
index a0a81f1d..fcd2328b 100644
--- a/apps/web/src/validators/shared/RegisterForm.ts
+++ b/apps/web/src/validators/shared/RegisterForm.ts
@@ -160,7 +160,7 @@ export const RegisterFormValidator = z.object({
 		.max(20, {
 			message: "Your HackerTag must be less than 20 characters long",
 		})
-		.regex(/^[a-zA-Z0-9]+$/, {
+		.regex(c.registration.hackerTagRegex, {
 			message: "HackerTag must be alphanumeric and have no spaces",
 		})
 		.toLowerCase()
diff --git a/apps/web/src/validators/shared/registration.ts b/apps/web/src/validators/shared/registration.ts
new file mode 100644
index 00000000..52483c78
--- /dev/null
+++ b/apps/web/src/validators/shared/registration.ts
@@ -0,0 +1,193 @@
+import z from "zod";
+import { userWithHackerDataInsertSchema } from "db/zod";
+import c from "config";
+import { isProfane } from "no-profanity";
+import { PHONE_NUMBER_REGEX } from "@/lib/constants";
+
+const defaultSelectPrettyError = c.zod.defaultSelectPrettyError;
+const defaultInputPrettyError = c.zod.defaultInputPrettyError;
+const noProfanityValidator = (val: any) => !isProfane(val);
+const noProfanityMessage = "Profanity is not allowed";
+
+export const uploadResumeSchema = z.object({
+	resumeFile: z.instanceof(File),
+});
+
+const countryList = Object.freeze(
+	c.registration.countries.map((countryObject) => countryObject.code),
+) as readonly [string, ...string[]];
+
+export const hackerRegistrationFormValidator = z
+	.object({
+		...userWithHackerDataInsertSchema.shape,
+		firstName: z.string().min(1, defaultInputPrettyError).max(50, {
+			message: "First name must be between 1 and 50 characters",
+		}),
+		lastName: z.string().min(1, defaultInputPrettyError).max(50, {
+			message: "Last name must be between 1 and 50 characters",
+		}),
+		email: z
+			.string()
+			.email({
+				message: "Email must be a valid email (eg: me@example.com",
+			})
+			.max(255, {
+				message: "Email must be less than 255 characters.",
+			}),
+		age: z
+			.number()
+			.min(18, {
+				message: "You must be at least 18 years old to register.",
+			})
+			.max(100, {
+				message: "You must be less than 100 years old to register",
+			})
+			.positive({ message: "Value must be positive" })
+			.int({ message: "Value must be an integer" })
+			.or(z.string())
+			.pipe(
+				z.coerce
+					.number()
+					.min(18, {
+						message:
+							"You must be at least 18 years old to register.",
+					})
+					.max(100, {
+						message:
+							"You must be less than 100 years old to register",
+					})
+					.positive({ message: "Value must be positive" })
+					.int({ message: "Value must be an integer" }),
+			),
+		gender: z.enum(c.registration.genderOptions, defaultSelectPrettyError),
+		race: z.enum(c.registration.raceOptions, defaultSelectPrettyError),
+		ethnicity: z.enum(
+			c.registration.ethnicityOptions,
+			defaultSelectPrettyError,
+		),
+		phoneNumber: z
+			.string()
+			.min(10)
+			.max(30, {
+				message: "Phone number must be between 10 and 30 characters",
+			})
+			.regex(PHONE_NUMBER_REGEX, {
+				message: "Phone number must be a valid phone number",
+			}),
+		countryOfResidence: z.enum(countryList, defaultSelectPrettyError),
+		hasAcceptedMLHCoC: z.boolean().refine((val) => val === true, {
+			message: "You must accept the MLH Code of Conduct.",
+		}),
+		hasSharedDataWithMLH: z.boolean().refine((val) => val === true, {
+			message:
+				"You must accept the MLH Terms & Conditions and Privacy Policy.",
+		}),
+		university: z.enum(c.registration.schools, defaultSelectPrettyError),
+		schoolID: z
+			.string()
+			.length(c.localUniversityShortIDMaxLength, {
+				message: `${c.localUniversitySchoolIDName} must be than ${c.localUniversityShortIDMaxLength} characters.`,
+			})
+			.regex(c.registration.universityShortIDRegex, {
+				message: "School ID must be a valid school ID",
+			})
+			.or(z.literal("NOT_LOCAL_SCHOOL")),
+		softwareExperience: z.enum(
+			c.registration.softwareExperienceOptions,
+			defaultSelectPrettyError,
+		),
+		levelOfStudy: z.enum(
+			c.registration.levelsOfStudy,
+			defaultSelectPrettyError,
+		),
+		hackathonsAttended: z
+			.number()
+			.min(0, { message: "Value must be positive or zero" })
+			.max(200, { message: "Value must be less than 200" })
+			.int({ message: "Value must be an integer" })
+			.or(z.string())
+			.pipe(
+				z.coerce
+					.number()
+					.min(0, { message: "Value must be positive or zero" })
+					.max(200, { message: "Value must be less than 200" })
+					.int({ message: "Value must be an integer" }),
+			),
+		heardFrom: z.enum(
+			c.registration.heardFromOptions,
+			defaultSelectPrettyError,
+		),
+		shirtSize: z.enum(
+			c.registration.shirtSizeOptions,
+			defaultSelectPrettyError,
+		),
+		dietRestrictions: z
+			.array(
+				z.enum(
+					c.registration.dietaryRestrictionOptions,
+					defaultSelectPrettyError,
+				),
+			)
+			.optional(),
+		pronouns: z.string().min(1).max(20, {
+			message: "Pronouns must be between 1 and 20 characters",
+		}),
+		major: z.enum(c.registration.majors, defaultSelectPrettyError),
+		hackerTag: z
+			.string()
+			.min(3, {
+				message: "Your HackerTag must be more than 3 characters long",
+			})
+			.max(20, {
+				message: "Your HackerTag must be less than 20 characters long",
+			})
+			.regex(c.registration.hackerTagRegex, {
+				message: "HackerTag must be alphanumeric and have no spaces",
+			})
+			.toLowerCase()
+			.refine(noProfanityValidator, noProfanityMessage),
+		bio: z
+			.string()
+			.min(1)
+			.max(c.registration.maxBioSize, {
+				message: `Bio must be less than ${c.registration.maxBioSize} characters.`,
+			})
+			.refine(noProfanityValidator, noProfanityMessage),
+		skills: z
+			.array(
+				z.object({
+					id: z.string(),
+					text: z.string(),
+				}),
+			)
+			.refine((val) => val.length <= c.registration.maxNumberOfSkills, {
+				message: `You can only have up to ${c.registration.maxNumberOfSkills} skills`,
+			}),
+		accommodationNote: z
+			.string()
+			.max(c.registration.maxaccommodationNoteSize, {
+				message: `Accommodation note must be less than ${c.registration.maxaccommodationNoteSize} characters.`,
+			})
+			.optional(),
+	})
+	.merge(
+		z.object({
+			...uploadResumeSchema.shape,
+			resumeFile: z.any(),
+			//  z.instanceof(File).nullable(),
+		}),
+	)
+	.omit({
+		clerkID: true,
+		isFullyRegistered: true,
+		signupTime: true,
+		role: true,
+		isRSVPed: true,
+		isApproved: true,
+		group: true,
+		points: true,
+		profilePhoto: true,
+		checkinTimestamp: true,
+		teamID: true,
+		resume: true,
+	});
diff --git a/apps/web/src/validators/shared/team.ts b/apps/web/src/validators/shared/team.ts
index 1c2dda9f..8e1b045c 100644
--- a/apps/web/src/validators/shared/team.ts
+++ b/apps/web/src/validators/shared/team.ts
@@ -1,5 +1,5 @@
 import { z } from "zod";
-
+import c from "config";
 export const newTeamValidator = z.object({
 	name: z
 		.string()
@@ -24,7 +24,7 @@ export const newTeamValidator = z.object({
 		.max(25, {
 			message: "Team Tag must be less than 25 characters long",
 		})
-		.regex(/^[a-zA-Z0-9]+$/, {
+		.regex(c.registration.hackerTagRegex, {
 			message: "Team Tag must be alphanumeric and have no spaces",
 		}),
 	photo: z.string().url(),
diff --git a/packages/config/hackkit.config.ts b/packages/config/hackkit.config.ts
index 58fa86b0..b6b2d8b6 100644
--- a/packages/config/hackkit.config.ts
+++ b/packages/config/hackkit.config.ts
@@ -1,6 +1,6 @@
 const defaultTheme = "dark";
 
-const schools = [
+const schoolOptions = [
 	"The University of Texas at San Antonio",
 	"American Heritage School",
 	"American River College, California",
@@ -415,7 +415,7 @@ const schools = [
 	"Other",
 ] as const;
 
-const majors = [
+const majorOptions = [
 	"Computer Science",
 	"Accounting",
 	"Accounting Technician",
@@ -536,28 +536,29 @@ const levelsOfStudy = [
 	"Undergraduate University (3+ year)",
 	"Graduate University (Masters, Professional, Doctoral, etc)",
 	"Code School / Bootcamp",
+	"Recent Grad",
 	"Other Vocational / Trade Program or Apprenticeship",
 	"Post Doctorate",
 	"Other",
 	"I’m not currently a student",
 	"Prefer not to answer",
-];
+] as const;
 
 const dietaryRestrictionOptions = [
 	"Vegan",
 	"Vegetarian",
 	"Nuts",
 	"Fish",
-	"Wheat",
 	"Dairy",
 	"Eggs",
 	"Halal",
 	"Kosher",
 	"Gluten-Free",
 	"Soy",
-];
+] as const;
 
-const countries = [
+const countryOptions = [
+	{ name: "United States", code: "US" },
 	{ name: "Afghanistan", code: "AF" },
 	{ name: "Albania", code: "AL" },
 	{ name: "Algeria", code: "DZ" },
@@ -740,7 +741,6 @@ const countries = [
 	{ name: "Ukraine", code: "UA" },
 	{ name: "United Arab Emirates", code: "AE" },
 	{ name: "United Kingdom", code: "GB" },
-	{ name: "United States", code: "US" },
 	{ name: "Uruguay", code: "UY" },
 	{ name: "Uzbekistan", code: "UZ" },
 	{ name: "Vanuatu", code: "VU" },
@@ -750,7 +750,7 @@ const countries = [
 	{ name: "Yemen", code: "YE" },
 	{ name: "Zambia", code: "ZM" },
 	{ name: "Zimbabwe", code: "ZW" },
-];
+] as const;
 
 const raceOptions = [
 	"Asian Indian",
@@ -771,7 +771,38 @@ const raceOptions = [
 	"Other Pacific Islander",
 	"Other",
 	"Prefer Not to Answer",
-];
+] as const;
+
+const genderOptions = [
+	"Male",
+	"Female",
+	"Non-binary",
+	"Other",
+	"Prefer Not To Say",
+] as const;
+
+const ethnicityOptions = [
+	"Hispanic or Latino",
+	"Not Hispanic or Latino",
+] as const;
+
+const heardFromOptions = [
+	"Instagram",
+	"Class Presentation",
+	"Twitter",
+	"Event Site",
+	"Friend",
+	"Other",
+] as const;
+
+const shirtSizeOptions = ["S", "M", "L", "XL", "2XL", "3XL"] as const;
+
+const softwareExperienceOptions = [
+	"Beginner",
+	"Intermediate",
+	"Advanced",
+	"Expert",
+] as const;
 
 const c = {
 	hackathonName: "HackKit",
@@ -781,16 +812,43 @@ const c = {
 	botName: "HackKit",
 	botParticipantRole: "Participant",
 	hackathonTimezone: "America/Chicago",
-	localUniversityName: schools[0],
-	localUniversitySchoolIDName: "ABC123",
+	localUniversityName: schoolOptions[0],
+	localUniversitySchoolIDName: "UTSA id (abc123)",
 	localUniversityShortIDMaxLength: 6,
 	registration: {
-		schools,
-		majors,
+		schools: schoolOptions,
+		majors: majorOptions,
 		levelsOfStudy,
 		dietaryRestrictionOptions,
-		countries,
+		countries: countryOptions,
 		raceOptions,
+		genderOptions,
+		ethnicityOptions,
+		heardFromOptions,
+		shirtSizeOptions,
+		softwareExperienceOptions,
+		minRequiredAge: 18,
+		hackerTagRegex: /^[a-zA-Z0-9]+$/,
+		universityShortIDRegex: /^[a-z]{3}[0-9]{3}$/,
+		maxNumberOfSkills: 20,
+		maxBioSize: 500,
+		maxaccommodationNoteSize: 1500,
+	},
+	zod: {
+		defaultSelectPrettyError: {
+			errorMap: () => ({ message: "Please select a value" }),
+		},
+		defaultInputPrettyError: {
+			message: "Please enter a value",
+		},
+	},
+	db: {
+		UniqueKeyMapper: {
+			user_common_data_hacker_tag_unique:
+				"Hacker Tag is taken. Please use another one.",
+			user_common_data_email_unique: "Email is already in use",
+			users_clerk_id_unique:'You have already registered. Please login to your account',
+		},
 	},
 	groups: {
 		"Guild A | Group A": {
diff --git a/packages/db/functions/user.ts b/packages/db/functions/user.ts
index 67b69788..0c70dae6 100644
--- a/packages/db/functions/user.ts
+++ b/packages/db/functions/user.ts
@@ -1,5 +1,5 @@
 import { db, eq } from "..";
-import { userCommonData } from "../schema";
+import { userCommonData, userHackerData } from "../schema";
 import { User } from "../types";
 
 // const _getAllUsers = db.query.userCommonData.findMany().prepare("getAllUsers");
@@ -38,3 +38,9 @@ export function getUserByTag(hackerTag: string): Promise<User | undefined> {
 		where: eq(userCommonData.hackerTag, hackerTag),
 	});
 }
+
+export function updateUserResume(userID:string,url:string){
+	return db.update(userHackerData).set({
+		resume:url
+	}).where(eq(userHackerData.clerkID,userID));
+}
\ No newline at end of file
diff --git a/packages/db/index.ts b/packages/db/index.ts
index 4bd6f3bb..ef85b675 100644
--- a/packages/db/index.ts
+++ b/packages/db/index.ts
@@ -4,6 +4,7 @@ import { drizzle } from "drizzle-orm/vercel-postgres";
 import * as schema from "./schema";
 
 export * from "drizzle-orm";
+export * as zod from "./zod";
 export const db = drizzle(sql, { schema });
 
 // await migrate(db, { migrationsFolder: "../../drizzle" });
diff --git a/packages/db/package.json b/packages/db/package.json
index 2ca344e9..248e9ddf 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -20,8 +20,10 @@
     "@vercel/postgres": "^0.9.0",
     "dotenv": "^16.4.5",
     "drizzle-orm": "^0.31.2",
+    "drizzle-zod": "^0.5.1",
     "esbuild-register": "^3.5.0",
-    "postgres": "^3.4.4"
+    "postgres": "^3.4.4",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "drizzle-kit": "^0.22.7"
diff --git a/packages/db/schema.ts b/packages/db/schema.ts
index 02f79c5c..b2a7783d 100644
--- a/packages/db/schema.ts
+++ b/packages/db/schema.ts
@@ -68,6 +68,7 @@ export const userCommonData = pgTable("user_common_data", {
 	race: varchar("race", { length: 75 }).notNull(),
 	ethnicity: varchar("ethnicity", { length: 50 }).notNull(),
 	shirtSize: varchar("shirt_size", { length: 5 }).notNull(),
+	// Come back and fix this to match the type of skills
 	dietRestrictions: json("diet_restrictions").notNull(),
 	accommodationNote: text("accommodation_note"),
 	discord: varchar("discord", { length: 60 }),
diff --git a/packages/db/types.ts b/packages/db/types.ts
index 397bd787..6fa7778e 100644
--- a/packages/db/types.ts
+++ b/packages/db/types.ts
@@ -11,3 +11,83 @@ export interface Hacker extends User {
 		team?: Team | null;
 	};
 }
+
+export interface NoticeOrError {
+	message: string | undefined;
+	severity: string | undefined;
+	code: string | undefined;
+	detail: string | undefined;
+	hint: string | undefined;
+	position: string | undefined;
+	internalPosition: string | undefined;
+	internalQuery: string | undefined;
+	where: string | undefined;
+	schema: string | undefined;
+	table: string | undefined;
+	column: string | undefined;
+	dataType: string | undefined;
+	constraint: string | undefined;
+	file: string | undefined;
+	line: string | undefined;
+	routine: string | undefined;
+}
+export type MessageName =
+	| "parseComplete"
+	| "bindComplete"
+	| "closeComplete"
+	| "noData"
+	| "portalSuspended"
+	| "replicationStart"
+	| "emptyQuery"
+	| "copyDone"
+	| "copyData"
+	| "rowDescription"
+	| "parameterDescription"
+	| "parameterStatus"
+	| "backendKeyData"
+	| "notification"
+	| "readyForQuery"
+	| "commandComplete"
+	| "dataRow"
+	| "copyInResponse"
+	| "copyOutResponse"
+	| "authenticationOk"
+	| "authenticationMD5Password"
+	| "authenticationCleartextPassword"
+	| "authenticationSASL"
+	| "authenticationSASLContinue"
+	| "authenticationSASLFinal"
+	| "error"
+	| "notice";
+
+export class DatabaseError extends Error implements NoticeOrError {
+	public severity: string | undefined;
+	public code: string | undefined;
+	public detail: string | undefined;
+	public hint: string | undefined;
+	public position: string | undefined;
+	public internalPosition: string | undefined;
+	public internalQuery: string | undefined;
+	public where: string | undefined;
+	public schema: string | undefined;
+	public table: string | undefined;
+	public column: string | undefined;
+	public dataType: string | undefined;
+	public constraint: string | undefined;
+	public file: string | undefined;
+	public line: string | undefined;
+	public routine: string | undefined;
+	constructor(
+		message: string,
+		public readonly length: number,
+		public readonly name: MessageName,
+	) {
+		super(message);
+	}
+	// This is a work around as the true DatabaeError class is not properly exported in Vercel Postgres.
+	// Therefore, we create a mock up of the DatabaseError object sourced from: https://github.com/brianc/node-postgres/blob/8b2768f91d284ff6b97070aaf6602560addac852/packages/pg-protocol/src/messages.ts#L97
+	// And override the instance function as it is technically not the true class object
+	static [Symbol.hasInstance](instance: any) {
+		return instance.constructor.name === "DatabaseError";
+	}
+}
diff --git a/packages/db/zod.ts b/packages/db/zod.ts
new file mode 100644
index 00000000..21ee9f59
--- /dev/null
+++ b/packages/db/zod.ts
@@ -0,0 +1,9 @@
+import { userCommonData, userHackerData } from "./schema";
+import { createInsertSchema } from "drizzle-zod";
+
+export const userCommonDataInsertSchema = createInsertSchema(userCommonData);
+export const userHackerDataInsertSchema = createInsertSchema(userHackerData);
+
+export const userWithHackerDataInsertSchema = userCommonDataInsertSchema.merge(
+	userHackerDataInsertSchema,
+);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1da6f5ab..ba85f538 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -101,6 +101,9 @@ importers:
       '@radix-ui/react-accordion':
         specifier: ^1.1.2
         version: 1.1.2(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-alert-dialog':
+        specifier: ^1.1.1
+        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
       '@radix-ui/react-avatar':
         specifier: ^1.0.3
         version: 1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
@@ -356,12 +359,18 @@ importers:
       drizzle-orm:
         specifier: ^0.31.2
         version: 0.31.2(@planetscale/database@1.18.0)(@types/react@18.3.3)(@vercel/postgres@0.9.0)(pg@8.12.0)(postgres@3.4.4)(react@18.3.1)
+      drizzle-zod:
+        specifier: ^0.5.1
+        version: 0.5.1(drizzle-orm@0.31.2)(zod@3.23.8)
       esbuild-register:
         specifier: ^3.5.0
         version: 3.5.0(esbuild@0.24.0)
       postgres:
         specifier: ^3.4.4
         version: 3.4.4
+      zod:
+        specifier: ^3.23.8
+        version: 3.23.8
     devDependencies:
       drizzle-kit:
         specifier: ^0.22.7
@@ -1406,7 +1415,7 @@ packages:
       discord-api-types: 0.37.83
       fast-deep-equal: 3.1.3
       ts-mixer: 6.0.4
-      tslib: 2.6.2
+      tslib: 2.6.3
     dev: false
 
   /@discordjs/collection@1.5.3:
@@ -1437,7 +1446,7 @@ packages:
       '@vladfrangu/async_event_emitter': 2.4.4
       discord-api-types: 0.37.83
       magic-bytes.js: 1.10.0
-      tslib: 2.6.2
+      tslib: 2.6.3
       undici: 6.13.0
     dev: false
 
@@ -1457,7 +1466,7 @@ packages:
       '@types/ws': 8.5.11
       '@vladfrangu/async_event_emitter': 2.4.4
       discord-api-types: 0.37.83
-      tslib: 2.6.2
+      tslib: 2.6.3
       ws: 8.18.0(bufferutil@4.0.8)(utf-8-validate@6.0.4)
     transitivePeerDependencies:
       - bufferutil
@@ -2919,6 +2928,31 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-alert-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-wmCoJwj7byuVuiLKqDLlX7ClSUU0vd9sdCeM+2Ls+uf13+cpSJoMgwysHq1SGVVkJj5Xn0XWi1NoRCdkMpr6Mw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-dialog': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-arrow@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-wSP+pHsB/jQRaL6voubsQ/ZlrGBHHrOjmBnr19hxYgtS0WvAFwZhK2WP/YY5yF9uKECCEEDGxuLxq1NBK51wFA==}
     peerDependencies:
@@ -3141,6 +3175,19 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-b4inOtiaOnYf9KWyO3jAeeCG6FeyfY6ldiEPanbUjWd+xIk5wZeHa8yVwmrJ2vderhu/BQvzCrJI0lHd+wIiqw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-context@1.0.1(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-ebbrdFoYTcuZ0v4wG5tedGnp9tzcV8awzsxYph7gXUyvnNLuTIcCk1q17JEbnVhXAKG9oX3KtchwiMIAYp9NLg==}
     peerDependencies:
@@ -3168,6 +3215,19 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-context@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-OKrckBy+sMEgYM/sMmqmErVn0kZqrHPJze+Ql3DzYsDDp0hl0L62nx/2122/Bvps1qz645jlcu2tD9lrRSdf8A==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-dialog@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-hJtRy/jPULGQZceSAP2Re6/4NpKo8im6V8P2hUqZsdFiSL8l35kYsw3qbRI6Ay5mQd2+wlLqje770eq+RJ3yZg==}
     peerDependencies:
@@ -3236,6 +3296,39 @@ packages:
       react-remove-scroll: 2.5.5(@types/react@18.3.3)(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-zysS+iU4YP3STKNS6USvFVqI4qqx8EpiwmT5TuCApVEBca+eRCbONi4EgzfNSuVnOXvC5UPHHMjs8RXO6DH9Bg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      aria-hidden: 1.2.4
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+      react-remove-scroll: 2.5.7(@types/react@18.3.3)(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-direction@1.0.1(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-RXcvnXgyvYvBEOhCBuddKecVkoMiI10Jcm5cTI7abJRAHYfFxeu+FBQs/DvdxSYucxR5mna0dNsL6QFlds5TMA==}
     peerDependencies:
@@ -3337,6 +3430,30 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-dismissable-layer@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-/UovfmmXGptwGcBQawLzvn2jOfM0t4z3/uKffoBlj724+n3FvBbZ7M0aaBOmkp6pqFYpO4yx8tSVJjx3Fl2jig==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-dropdown-menu@2.0.5(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-xdOrZzOTocqqkCkYo8yRPCib5OkTkqN7lqNCdxwPOdE466DOaNl4N8PkUIlsXthQvW5Wwkd+aEmWpfWlBoDPEw==}
     peerDependencies:
@@ -3391,6 +3508,19 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-focus-guards@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-w6XZNUPVv6xCpZUqb/yN9DL6auvpGX3C/ee6Hdi16v2UUy25HV2Q5bcflsiDyT/g5RwbPQ/GIT1vLkeRb+ITBw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-focus-scope@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-upXdPfqI4islj2CslyfUBNlaJCPybbqRHAi1KER7Isel9Q2AtSJ0zRBZv8mWQiFXD2nyAJ4BhC3yXgZ6kMBSrQ==}
     peerDependencies:
@@ -3459,6 +3589,28 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-200UD8zylvEyL8Bx+z76RJnASR2gRMuxlgFCPAe/Q/679a/r0eK3MBVYMb7vZODZcffZBdob1EGnky78xmVvcA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-id@1.0.1(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-tI7sT/kqYp8p96yGWY1OAnLHrqDgzHefRBKQ2YAkBS5ja7QLcZ9Z/uY7bEjPUatf8RomoXM8/1sMj1IJaE5UzQ==}
     peerDependencies:
@@ -3488,6 +3640,20 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-id@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-label@2.0.2(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-N5ehvlM7qoTLx7nWPodsPYPgMzA5WM8zZChQg8nyFJKnDO5WHdba1vv5/H6IO5LtJMfD2Q3wh1qHFGNtK0w3bQ==}
     peerDependencies:
@@ -3738,6 +3904,27 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-portal@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-A3UtLk85UtqhzFqtoC8Q0KvR2GbXF3mtPgACSazajqq6A41mEQgo53iPzY4i6BwDxlIFqWIhiQ2G729n+2aw/g==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-presence@1.0.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-UXLW4UAbIY5ZjcvzjfRFo5gxva8QirC9hF7wRE4U5gz+TP0DbRk+//qyuAQ1McDxBt1xNMBTaciFGvEmJvAZCg==}
     peerDependencies:
@@ -3781,6 +3968,27 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-presence@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-Gq6wuRN/asf9H/E/VzdKoUtT8GC9PQc9z40/vEr0VCJ4u5XvvhWIrSsCB6vD2/cH7ugTdSfYq9fLJCcM00acrQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-primitive@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-yi58uVyoAcK/Nq1inRY56ZSjKypBNKTa/1mcL8qdl6oJeEaDbOldlzrGn7P6Q3Id5d+SYNGc5AJgc4vGhjs5+g==}
     peerDependencies:
@@ -3822,6 +4030,26 @@ packages:
       react-dom: 18.3.1(react@18.3.1)
     dev: false
 
+  /@radix-ui/react-primitive@2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
+    resolution: {integrity: sha512-ZSpFm0/uHa8zTvKBDjLFWLo8dkr4MBsiDLz0g3gMUwqgLHz9rTaRRGYDgvZPtBJgYCBKXkS9fzmoySgr8CO6Cw==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+    dependencies:
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+      react: 18.3.1
+      react-dom: 18.3.1(react@18.3.1)
+    dev: false
+
   /@radix-ui/react-roving-focus@1.0.4(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-2mUg5Mgcu001VkGy+FfzZyzbmuUWzgWkj3rvv4yu+mLw03+mTzbxZHvfcGyFp2b8EkQeMkpRQ5FiA2Vr2O6TeQ==}
     peerDependencies:
@@ -3949,6 +4177,20 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-slot@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-switch@1.0.3(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-mxm87F88HyHztsI7N+ZUmEoARGkC22YVW5CaC+Byc+HRpuvCrOBPTAnXgf+tZ/7i0Sg/eOePGdMhUKhPaQEqow==}
     peerDependencies:
@@ -4082,6 +4324,19 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-use-controllable-state@1.0.1(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-Svl5GY5FQeN758fWKrjM6Qb7asvXeiZltlT4U2gVfl8Gx5UAv2sMR0LWo8yhsIZh2oQ0eFdZ59aoOOMV7b47VA==}
     peerDependencies:
@@ -4111,6 +4366,20 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-use-escape-keydown@1.0.3(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-vyL82j40hcFicA+M4Ex7hVkB9vHgSse1ZWomAqV2Je3RleKGO5iM8KMOEtfoSB0PnIelMd2lATjTGMYqN5ylTg==}
     peerDependencies:
@@ -4140,6 +4409,20 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@18.3.1)
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-use-layout-effect@1.0.1(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-v/5RegiJWYdoCvMnITBkNNx6bCj20fiaJnWtRkU18yITptraXjffz5Qbn05uOiQnOvi+dbkznkoaMltz1GnszQ==}
     peerDependencies:
@@ -4167,6 +4450,19 @@ packages:
       react: 18.3.1
     dev: false
 
+  /@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+    dev: false
+
   /@radix-ui/react-use-previous@1.0.1(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-cV5La9DPwiQ7S0gf/0qiD6YgNqM5Fk97Kdrlc5yBcrF3jyEZQwm7vYFqMo4IfeHgJXsRaMvLABFtd0OVEmZhDw==}
     peerDependencies:
@@ -11159,6 +11455,22 @@ packages:
       tslib: 2.6.3
     dev: false
 
+  /react-remove-scroll-bar@2.3.6(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-DtSYaao4mBmX+HDo5YWYdBWQwYIQQshUV/dVxFxK+KM26Wjwp1gZ6rv6OC3oujI6Bfu6Xyg3TwK533AQutsn/g==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+      react-style-singleton: 2.2.1(@types/react@18.3.3)(react@18.3.1)
+      tslib: 2.6.3
+    dev: false
+
   /react-remove-scroll@2.5.5(@types/react@18.3.3)(react@18.3.1):
     resolution: {integrity: sha512-ImKhrzJJsyXJfBZ4bzu8Bwpka14c/fQt0k+cyFp/PBhTfyDnU5hjOtM4AG/0AMyy8oKzOTR0lDgJIM7pYXI0kw==}
     engines: {node: '>=10'}
@@ -11197,6 +11509,25 @@ packages:
       use-sidecar: 1.1.2(@types/react@18.2.47)(react@18.3.1)
     dev: false
 
+  /react-remove-scroll@2.5.7(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-FnrTWO4L7/Bhhf3CYBNArEG/yROV0tKmTv7/3h9QCFvH6sndeFf1wPqOcbFVu5VAulS5dV1wGT3GZZ/1GawqiA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+      react-remove-scroll-bar: 2.3.6(@types/react@18.3.3)(react@18.3.1)
+      react-style-singleton: 2.2.1(@types/react@18.3.3)(react@18.3.1)
+      tslib: 2.6.3
+      use-callback-ref: 1.3.2(@types/react@18.3.3)(react@18.3.1)
+      use-sidecar: 1.1.2(@types/react@18.3.3)(react@18.3.1)
+    dev: false
+
   /react-smooth@4.0.1(react-dom@18.3.1)(react@18.3.1):
     resolution: {integrity: sha512-OE4hm7XqR0jNOq3Qmk9mFLyd6p2+j6bvbPJ7qlB7+oo0eNcL2l7WQzG6MBnT3EXY6xzkLMUBec3AfewJdA0J8w==}
     peerDependencies:
@@ -12379,6 +12710,21 @@ packages:
       tslib: 2.6.3
     dev: false
 
+  /use-callback-ref@1.3.2(@types/react@18.3.3)(react@18.3.1):
+    resolution: {integrity: sha512-elOQwe6Q8gqZgDA8mrh44qRTQqpIHDcZ3hXTLjBe1i4ph8XpNJnO+aQf3NaG+lriLopI4HMx9VjQLfPQ6vhnoA==}
+    engines: {node: '>=10'}
+    peerDependencies:
+      '@types/react': ^16.8.0 || ^17.0.0 || ^18.0.0
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+    dependencies:
+      '@types/react': 18.3.3
+      react: 18.3.1
+      tslib: 2.6.3
+    dev: false
+
   /use-debounce@10.0.1(react@18.3.1):
     resolution: {integrity: sha512-0uUXjOfm44e6z4LZ/woZvkM8FwV1wiuoB6xnrrOmeAEjRDDzTLQNRFtYHvqUsJdrz1X37j0rVGIVp144GLHGKg==}
     engines: {node: '>= 16.0.0'}