diff --git a/packages/api/src/fetchOption.ts b/packages/api/src/fetchOption.ts
index 138d29af..9feccc95 100644
--- a/packages/api/src/fetchOption.ts
+++ b/packages/api/src/fetchOption.ts
@@ -1,9 +1,9 @@
-import { ApiRequest, GetQuestionOptionResponse } from './types';
+import { ApiRequest, GetOptionResponse } from './types';
 
 export async function fetchOption({
   serverUrl,
   optionId,
-}: ApiRequest<{ optionId: string }>): Promise<GetQuestionOptionResponse | null> {
+}: ApiRequest<{ optionId: string }>): Promise<GetOptionResponse | null> {
   try {
     const response = await fetch(`${serverUrl}/api/options/${optionId}`, {
       credentials: 'include',
@@ -15,7 +15,7 @@ export async function fetchOption({
       throw new Error(`HTTP Error!, Status: ${response.status}`);
     }
 
-    const option = (await response.json()) as { data: GetQuestionOptionResponse };
+    const option = (await response.json()) as { data: GetOptionResponse };
     return option.data;
   } catch (error) {
     console.error('Error fetching option:', error);
diff --git a/packages/api/src/postRegistration.ts b/packages/api/src/postRegistration.ts
index 365eed51..11d2b267 100644
--- a/packages/api/src/postRegistration.ts
+++ b/packages/api/src/postRegistration.ts
@@ -5,7 +5,7 @@ export async function postRegistration({
   serverUrl,
 }: ApiRequest<{
   body: PostRegistrationRequest;
-}>): Promise<PostRegistrationResponse | null> {
+}>): Promise<PostRegistrationResponse | { errors: string[] } | null> {
   try {
     const response = await fetch(`${serverUrl}/api/registrations`, {
       method: 'POST',
@@ -17,6 +17,10 @@ export async function postRegistration({
     });
 
     if (!response.ok) {
+      if (response.status < 500) {
+        const errors = (await response.json()) as { errors: string[] };
+        return errors;
+      }
       throw new Error(`HTTP error! Status: ${response.status}`);
     }
 
diff --git a/packages/api/src/putRegistration.ts b/packages/api/src/putRegistration.ts
index 9ddbf0e5..2a658c07 100644
--- a/packages/api/src/putRegistration.ts
+++ b/packages/api/src/putRegistration.ts
@@ -7,7 +7,7 @@ export async function putRegistration({
 }: ApiRequest<{
   registrationId: string;
   body: PutRegistrationRequest;
-}>): Promise<PutRegistrationResponse | null> {
+}>): Promise<PutRegistrationResponse | { errors: string[] } | null> {
   try {
     const response = await fetch(`${serverUrl}/api/registrations/${registrationId}`, {
       method: 'PUT',
@@ -19,6 +19,10 @@ export async function putRegistration({
     });
 
     if (!response.ok) {
+      if (response.status < 500) {
+        const errors = (await response.json()) as { errors: string[] };
+        return errors;
+      }
       throw new Error(`HTTP error! Status: ${response.status}`);
     }
 
diff --git a/packages/api/src/types/Events.ts b/packages/api/src/types/Events.ts
index c4082712..2ea07899 100644
--- a/packages/api/src/types/Events.ts
+++ b/packages/api/src/types/Events.ts
@@ -7,6 +7,7 @@ export type GetEventResponse = {
   createdAt: string;
   updatedAt: string;
   description: string | null;
+  fields: unknown;
   status: 'OPEN' | 'CLOSED' | 'UPCOMING' | null;
 };
 
diff --git a/packages/api/src/types/Options.ts b/packages/api/src/types/Options.ts
index 659b519a..8c0dbfe6 100644
--- a/packages/api/src/types/Options.ts
+++ b/packages/api/src/types/Options.ts
@@ -1,4 +1,4 @@
-export type QuestionOption = {
+export type Option = {
   id: string;
   createdAt: string;
   updatedAt: string;
@@ -7,11 +7,12 @@ export type QuestionOption = {
   userId?: string;
   optionSubTitle?: string;
   accepted: boolean;
+  data: unknown;
   fundingRequest: string;
 };
 
-export type GetQuestionOptionRequest = {
+export type GetOptionRequest = {
   optionId: string;
 };
 
-export type GetQuestionOptionResponse = QuestionOption;
+export type GetOptionResponse = Option;
diff --git a/packages/api/src/types/Questions.ts b/packages/api/src/types/Questions.ts
index a44ccc38..3e9b1805 100644
--- a/packages/api/src/types/Questions.ts
+++ b/packages/api/src/types/Questions.ts
@@ -25,4 +25,5 @@ export type Question = {
   description: string | null;
   cycleId: string;
   title: string;
+  fields: unknown;
 };
diff --git a/packages/api/src/types/RegistrationData.ts b/packages/api/src/types/RegistrationData.ts
index f6d8168f..033f17c7 100644
--- a/packages/api/src/types/RegistrationData.ts
+++ b/packages/api/src/types/RegistrationData.ts
@@ -13,33 +13,32 @@ export type PostRegistrationRequest = {
   eventId: string;
   groupId: string | null;
   status: RegistrationStatus;
-  registrationData: {
-    registrationFieldId: string;
-    value: string;
-  }[];
+  data: Record<
+    string,
+    {
+      value: string | number | boolean | string[] | null;
+      type: 'TEXT' | 'TEXTAREA' | 'SELECT' | 'CHECKBOX' | 'MULTI_SELECT' | 'NUMBER';
+      fieldId: string;
+    }
+  >;
 };
 
 export type PutRegistrationRequest = {
   eventId: string;
   groupId: string | null;
   status: RegistrationStatus;
-  registrationData: {
-    registrationFieldId: string;
-    value: string;
-  }[];
+  data: Record<
+    string,
+    {
+      value: string | number | boolean | string[] | null;
+      type: 'TEXT' | 'TEXTAREA' | 'SELECT' | 'CHECKBOX' | 'MULTI_SELECT' | 'NUMBER';
+      fieldId: string;
+    }
+  >;
 };
 
 export type PostRegistrationResponse = {
-  registrationData:
-    | {
-        id: string;
-        createdAt: string;
-        updatedAt: string;
-        registrationId: string;
-        registrationFieldId: string;
-        value: string;
-      }[]
-    | null;
+  data: unknown | null;
   id: string;
   createdAt: string;
   updatedAt: string;
@@ -49,16 +48,7 @@ export type PostRegistrationResponse = {
 };
 
 export type PutRegistrationResponse = {
-  registrationData:
-    | {
-        id: string;
-        createdAt: string;
-        updatedAt: string;
-        registrationId: string;
-        registrationFieldId: string;
-        value: string;
-      }[]
-    | null;
+  registrationData: unknown | null;
   id: string;
   createdAt: string;
   updatedAt: string;
diff --git a/packages/api/src/types/Registrations.ts b/packages/api/src/types/Registrations.ts
index 768e7645..c3495ba6 100644
--- a/packages/api/src/types/Registrations.ts
+++ b/packages/api/src/types/Registrations.ts
@@ -7,6 +7,7 @@ export type GetRegistrationResponseType = {
   groupId: string | null;
   eventId?: string | undefined;
   createdAt: string;
+  data: unknown;
   updatedAt: string;
   event?: {
     id: string;
diff --git a/packages/berlin/package.json b/packages/berlin/package.json
index 01779163..879af783 100644
--- a/packages/berlin/package.json
+++ b/packages/berlin/package.json
@@ -63,4 +63,4 @@
   "engines": {
     "node": "^20"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/berlin/src/_components/ui/command.tsx b/packages/berlin/src/_components/ui/command.tsx
index 265ce7c6..f19ed548 100644
--- a/packages/berlin/src/_components/ui/command.tsx
+++ b/packages/berlin/src/_components/ui/command.tsx
@@ -15,7 +15,7 @@ const Command = React.forwardRef<
   <CommandPrimitive
     ref={ref}
     className={cn(
-      'flex h-full w-full flex-col overflow-hidden rounded-md bg-popover text-popover-foreground',
+      'bg-popover text-popover-foreground flex h-full w-full flex-col overflow-hidden rounded-md',
       className,
     )}
     {...props}
@@ -29,7 +29,7 @@ const CommandDialog = ({ children, ...props }: CommandDialogProps) => {
   return (
     <Dialog {...props}>
       <DialogContent className="overflow-hidden p-0">
-        <Command className="[&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
+        <Command className="[&_[cmdk-group-heading]]:text-muted-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group]:not([hidden])_~[cmdk-group]]:pt-0 [&_[cmdk-group]]:px-2 [&_[cmdk-input-wrapper]_svg]:h-5 [&_[cmdk-input-wrapper]_svg]:w-5 [&_[cmdk-input]]:h-12 [&_[cmdk-item]]:px-2 [&_[cmdk-item]]:py-3 [&_[cmdk-item]_svg]:h-5 [&_[cmdk-item]_svg]:w-5">
           {children}
         </Command>
       </DialogContent>
@@ -46,7 +46,7 @@ const CommandInput = React.forwardRef<
     <CommandPrimitive.Input
       ref={ref}
       className={cn(
-        'flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50',
+        'placeholder:text-muted-foreground flex h-10 w-full rounded-md bg-transparent py-3 text-sm outline-none disabled:cursor-not-allowed disabled:opacity-50',
         className,
       )}
       {...props}
@@ -85,7 +85,7 @@ const CommandGroup = React.forwardRef<
   <CommandPrimitive.Group
     ref={ref}
     className={cn(
-      'overflow-hidden p-1 text-foreground [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium [&_[cmdk-group-heading]]:text-muted-foreground',
+      'text-foreground [&_[cmdk-group-heading]]:text-muted-foreground overflow-hidden p-1 [&_[cmdk-group-heading]]:px-2 [&_[cmdk-group-heading]]:py-1.5 [&_[cmdk-group-heading]]:text-xs [&_[cmdk-group-heading]]:font-medium',
       className,
     )}
     {...props}
@@ -100,7 +100,7 @@ const CommandSeparator = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <CommandPrimitive.Separator
     ref={ref}
-    className={cn('-mx-1 h-px bg-border', className)}
+    className={cn('bg-border -mx-1 h-px', className)}
     {...props}
   />
 ));
@@ -113,7 +113,7 @@ const CommandItem = React.forwardRef<
   <CommandPrimitive.Item
     ref={ref}
     className={cn(
-      'relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none aria-selected:bg-accent aria-selected:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
+      'aria-selected:bg-accent aria-selected:text-accent-foreground relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
       className,
     )}
     {...props}
@@ -125,7 +125,7 @@ CommandItem.displayName = CommandPrimitive.Item.displayName;
 const CommandShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
   return (
     <span
-      className={cn('ml-auto text-xs tracking-widest text-muted-foreground', className)}
+      className={cn('text-muted-foreground ml-auto text-xs tracking-widest', className)}
       {...props}
     />
   );
diff --git a/packages/berlin/src/_components/ui/dialog.tsx b/packages/berlin/src/_components/ui/dialog.tsx
index 828ac9de..44994afe 100644
--- a/packages/berlin/src/_components/ui/dialog.tsx
+++ b/packages/berlin/src/_components/ui/dialog.tsx
@@ -21,7 +21,7 @@ const DialogOverlay = React.forwardRef<
   <DialogPrimitive.Overlay
     ref={ref}
     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',
+      'data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 fixed inset-0 z-50 bg-black/80',
       className,
     )}
     {...props}
@@ -38,13 +38,13 @@ const DialogContent = React.forwardRef<
     <DialogPrimitive.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',
+        'bg-background 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%] fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border p-6 shadow-lg duration-200 sm:rounded-lg',
         className,
       )}
       {...props}
     >
       {children}
-      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+      <DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute right-4 top-4 rounded-sm opacity-70 transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:pointer-events-none">
         <Cross2Icon className="h-4 w-4" />
         <span className="sr-only">Close</span>
       </DialogPrimitive.Close>
@@ -84,7 +84,7 @@ const DialogDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DialogPrimitive.Description
     ref={ref}
-    className={cn('text-sm text-muted-foreground', className)}
+    className={cn('text-muted-foreground text-sm', className)}
     {...props}
   />
 ));
diff --git a/packages/berlin/src/_components/ui/popover.tsx b/packages/berlin/src/_components/ui/popover.tsx
index ebbaafc5..6783ddf7 100644
--- a/packages/berlin/src/_components/ui/popover.tsx
+++ b/packages/berlin/src/_components/ui/popover.tsx
@@ -21,7 +21,7 @@ const PopoverContent = React.forwardRef<
       align={align}
       sideOffset={sideOffset}
       className={cn(
-        'z-50 w-72 rounded-md border bg-popover p-4 text-popover-foreground shadow-md outline-none 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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2',
+        'bg-popover text-popover-foreground 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-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-72 rounded-md border p-4 shadow-md outline-none',
         className,
       )}
       {...props}
diff --git a/packages/berlin/src/_components/ui/separator.tsx b/packages/berlin/src/_components/ui/separator.tsx
index 41062d43..97d71cfe 100644
--- a/packages/berlin/src/_components/ui/separator.tsx
+++ b/packages/berlin/src/_components/ui/separator.tsx
@@ -14,7 +14,7 @@ const Separator = React.forwardRef<
     decorative={decorative}
     orientation={orientation}
     className={cn(
-      'shrink-0 bg-border',
+      'bg-border shrink-0',
       orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
       className,
     )}
diff --git a/packages/berlin/src/components/form/AccountForm.tsx b/packages/berlin/src/components/form/AccountForm.tsx
index da9b6c24..2174fe68 100644
--- a/packages/berlin/src/components/form/AccountForm.tsx
+++ b/packages/berlin/src/components/form/AccountForm.tsx
@@ -15,7 +15,7 @@ import { Subtitle } from '../typography/Subtitle.styled';
 import { FlexRowToColumn } from '../containers/FlexRowToColumn.styled';
 import { FormTextInput } from '../form-input';
 import { z } from 'zod';
-import { returnZodError } from '../../utils/validation';
+import { returnZodError } from '../../utils/zod-error-handler';
 
 type InitialUser = {
   username: string;
diff --git a/packages/berlin/src/components/header/Header.tsx b/packages/berlin/src/components/header/Header.tsx
index 7acf0a19..85ac3353 100644
--- a/packages/berlin/src/components/header/Header.tsx
+++ b/packages/berlin/src/components/header/Header.tsx
@@ -143,8 +143,10 @@ const UserMenu = () => {
           <User />
         </Icon>
       </NavigationMenuTrigger>
-      <NavigationMenuContent className="flex flex-col gap-4 p-4">
-        <UserMenuLinks />
+      <NavigationMenuContent>
+        <NavigationMenuList className="flex flex-col gap-4 p-4">
+          <UserMenuLinks />
+        </NavigationMenuList>
       </NavigationMenuContent>
     </NavigationMenuItem>
   );
diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index e9a2524a..782a522d 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -19,10 +19,13 @@ import { Body } from '../components/typography/Body.styled';
 import { useQueries, useQuery } from '@tanstack/react-query';
 import Link from '../components/link';
 import { Underline } from '../components/typography/Underline.styled';
+import { useNavigate } from 'react-router-dom';
 
 function Account() {
-  const { user, isLoading: userIsLoading } = useUser();
-  const [tab, setTab] = useState<'view' | 'edit'>('view');
+  const { user: initialUser, isLoading: userIsLoading } = useUser();
+  const isFirstLogin = !initialUser?.username;
+  const [tab, setTab] = useState<'view' | 'edit'>(isFirstLogin ? 'edit' : 'view');
+  const navigate = useNavigate();
 
   if (userIsLoading) {
     return <Title>Loading...</Title>;
@@ -31,20 +34,24 @@ function Account() {
   const tabs = {
     edit: (
       <AccountForm
-        user={user}
+        user={initialUser}
         initialUser={{
-          email: user?.email ?? '',
-          firstName: user?.firstName ?? '',
-          lastName: user?.lastName ?? '',
-          username: user?.username ?? '',
+          email: initialUser?.email ?? '',
+          firstName: initialUser?.firstName ?? '',
+          lastName: initialUser?.lastName ?? '',
+          username: initialUser?.username ?? '',
         }}
-        title="Edit Account"
+        title={isFirstLogin ? 'Complete Account' : 'Edit Account'}
         afterSubmit={() => {
+          if (isFirstLogin) {
+            navigate('/events');
+          }
+
           setTab('view');
         }}
       />
     ),
-    view: <AccountHub user={user} />,
+    view: <AccountHub user={initialUser} />,
   };
 
   return (
diff --git a/packages/berlin/src/pages/Register.tsx b/packages/berlin/src/pages/Register.tsx
index d30c2229..6ecd7b7b 100644
--- a/packages/berlin/src/pages/Register.tsx
+++ b/packages/berlin/src/pages/Register.tsx
@@ -1,7 +1,6 @@
 // React and third-party libraries
-import { useMutation, useQueries, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useEffect, useMemo, useState } from 'react';
-import ContentLoader from 'react-content-loader';
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useMemo, useState } from 'react';
 import { UseFormReturn, useForm } from 'react-hook-form';
 import toast from 'react-hot-toast';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -16,16 +15,11 @@ import {
   fetchEvent,
   fetchEventGroupCategories,
   fetchGroups,
-  fetchRegistrationData,
-  fetchRegistrationFields,
   fetchRegistrations,
   fetchUsersToGroups,
   postRegistration,
   postUsersToGroups,
   putRegistration,
-  type GetRegistrationDataResponse,
-  type GetRegistrationFieldsResponse,
-  type GetRegistrationResponseType,
   type GetUserResponse,
 } from 'api';
 
@@ -33,22 +27,21 @@ import {
 import useUser from '../hooks/useUser';
 
 // Components
+import { dataSchema, fieldsSchema } from '@/utils/form-validation';
+import { z } from 'zod';
 import Button from '../components/button';
 import { Carousel } from '../components/carousel';
 import { FlexColumn } from '../components/containers/FlexColumn.styled';
 import { Form } from '../components/containers/Form.styled';
+import { FormInput, FormSelectInput } from '../components/form-input';
 import Select from '../components/select';
 import Label from '../components/typography/Label';
 import { Subtitle } from '../components/typography/Subtitle.styled';
 import { SafeArea } from '../layout/Layout.styled';
-import { FormInput, FormSelectInput } from '../components/form-input';
 
 function Register() {
   const { user, isLoading } = useUser();
   const { eventId } = useParams();
-  const [selectedRegistrationFormKey, setSelectedRegistrationFormKey] = useState<
-    string | undefined
-  >();
 
   const { data: event } = useQuery({
     queryKey: ['event', eventId],
@@ -64,16 +57,6 @@ function Register() {
     enabled: !!eventId,
   });
 
-  const { data: registrationFields } = useQuery({
-    queryKey: ['event', eventId, 'registrations', 'fields'],
-    queryFn: () =>
-      fetchRegistrationFields({
-        eventId: eventId || '',
-        serverUrl: import.meta.env.VITE_SERVER_URL,
-      }),
-    enabled: !!eventId,
-  });
-
   const { data: usersToGroups } = useQuery({
     queryKey: ['user', user?.id, 'users-to-groups'],
     queryFn: () =>
@@ -107,42 +90,6 @@ function Register() {
     return 0;
   }, [groupCategories, usersToGroups]);
 
-  const multipleRegistrationData = useQueries({
-    queries:
-      registrations?.map((registration) => ({
-        queryKey: ['registrations', registration.id, 'registration-data'],
-        queryFn: () =>
-          fetchRegistrationData({
-            registrationId: registration.id || '',
-            serverUrl: import.meta.env.VITE_SERVER_URL,
-          }),
-        enabled: !!registration.id,
-      })) ?? [],
-    combine: (results) => {
-      // return a map of registration id to { data, loading }
-      return results.reduce(
-        (acc, result, idx) => {
-          if (registrations && registrations[idx] && result.data) {
-            acc[registrations[idx].id || ''] = {
-              data: result.data,
-              loading: result.isLoading,
-            };
-          }
-          return acc;
-        },
-        {} as Record<
-          string,
-          { data: GetRegistrationDataResponse | null | undefined; loading: boolean }
-        >,
-      );
-    },
-  });
-
-  const onRegistrationFormCreate = (newRegistrationId: string) => {
-    // select the newly created registration form
-    setSelectedRegistrationFormKey(newRegistrationId);
-  };
-
   if (isLoading) {
     return <Subtitle>Loading...</Subtitle>;
   }
@@ -155,12 +102,7 @@ function Register() {
         usersToGroups={usersToGroups}
         user={user}
         registrations={registrations}
-        selectedRegistrationFormKey={selectedRegistrationFormKey}
-        multipleRegistrationData={multipleRegistrationData}
-        registrationFields={registrationFields}
         event={event}
-        onRegistrationFormCreate={onRegistrationFormCreate}
-        setSelectedRegistrationFormKey={setSelectedRegistrationFormKey}
       />
     </SafeArea>
   );
@@ -171,30 +113,15 @@ const CarouselWrapper = ({
   usersToGroups,
   user,
   registrations,
-  selectedRegistrationFormKey,
-  multipleRegistrationData,
-  registrationFields,
   event,
-  onRegistrationFormCreate,
-  setSelectedRegistrationFormKey,
+  defaultStep,
 }: {
   defaultStep: number;
   groupCategories: GetGroupCategoriesResponse | null | undefined;
   usersToGroups: GetUsersToGroupsResponse | null | undefined;
   user: GetUserResponse | null | undefined;
   registrations: GetRegistrationsResponseType | undefined | null;
-  selectedRegistrationFormKey: string | undefined;
-  multipleRegistrationData: Record<
-    string,
-    {
-      data: GetRegistrationDataResponse | null | undefined;
-      loading: boolean;
-    }
-  >;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
   event: GetEventResponse | null | undefined;
-  onRegistrationFormCreate: (newRegistrationId: string) => void;
-  setSelectedRegistrationFormKey: (key: string) => void;
 }) => {
   const navigate = useNavigate();
 
@@ -212,20 +139,26 @@ const CarouselWrapper = ({
     useMutation({
       mutationFn: postRegistration,
       onSuccess: async (body) => {
-        if (body) {
-          toast.success('Registration saved successfully!');
-          await queryClient.invalidateQueries({
-            queryKey: ['event', body.eventId, 'registrations'],
-          });
-
-          // invalidate user registrations, this is for the 1 event use case
-          // where the authentication is because you are approved to the event
-          await queryClient.invalidateQueries({
-            queryKey: [user?.id, 'registrations'],
-          });
-        } else {
+        if (!body) {
           toast.error('Failed to save registration, please try again');
+          return;
+        }
+
+        if ('errors' in body) {
+          toast.error(body.errors[0]);
+          return;
         }
+
+        toast.success('Registration saved successfully!');
+        await queryClient.invalidateQueries({
+          queryKey: ['event', body.eventId, 'registrations'],
+        });
+
+        // invalidate user registrations, this is for the 1 event use case
+        // where the authentication is because you are approved to the event
+        await queryClient.invalidateQueries({
+          queryKey: [user?.id, 'registrations'],
+        });
       },
       onError: (error) => {
         console.error('Error saving registration:', error);
@@ -263,7 +196,7 @@ const CarouselWrapper = ({
           eventId: event?.id || '',
           groupId: null,
           status: 'DRAFT',
-          registrationData: [],
+          data: {},
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
@@ -273,7 +206,7 @@ const CarouselWrapper = ({
           eventId: event?.id || '',
           groupId: null,
           status: 'DRAFT',
-          registrationData: [],
+          data: {},
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
@@ -282,6 +215,7 @@ const CarouselWrapper = ({
 
   return (
     <Carousel
+      initialStep={defaultStep}
       onComplete={async () => {
         // query registration to check if it is approved
         const registrations = await queryClient.fetchQuery({
@@ -323,18 +257,19 @@ const CarouselWrapper = ({
           ),
         },
         {
-          isEnabled: (registrationFields?.length ?? 0) > 0,
+          isEnabled:
+            (fieldsSchema.safeParse(event?.fields).success
+              ? Object.values(fieldsSchema.parse(event?.fields)).length
+              : 0) > 0,
           render: ({ handleStepComplete }) => (
             <RegistrationForm
-              registrations={registrations}
               usersToGroups={usersToGroups}
-              selectedRegistrationFormKey={selectedRegistrationFormKey}
-              multipleRegistrationData={multipleRegistrationData}
-              registrationFields={registrationFields}
               user={user}
+              groupId={registrations?.at(0)?.groupId}
+              registrationId={registrations?.at(0)?.id}
+              mode={registrations?.at(0) ? 'edit' : 'create'}
+              data={registrations?.at(0)?.data}
               event={event}
-              onRegistrationFormCreate={onRegistrationFormCreate}
-              onSelectedRegistrationFormKeyChange={setSelectedRegistrationFormKey}
               onStepComplete={handleStepComplete}
             />
           ),
@@ -344,210 +279,6 @@ const CarouselWrapper = ({
   );
 };
 
-const sortRegistrationsByCreationDate = (registrations: GetRegistrationResponseType[]) => {
-  return [
-    ...registrations.sort((a, b) => {
-      return new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime();
-    }),
-  ];
-};
-
-const createRegistrationForms = ({
-  registrations,
-  usersToGroups,
-}: {
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-}) => {
-  const sortedRegistrationsByCreationDate = sortRegistrationsByCreationDate(registrations || []);
-
-  const registrationForms: {
-    key: string | 'create';
-    registration?: GetRegistrationResponseType;
-    group?: GetUsersToGroupsResponse[number]['group'];
-    mode: 'edit' | 'create';
-  }[] = sortedRegistrationsByCreationDate.map((reg) => {
-    return {
-      key: reg.id || '',
-      registration: reg,
-      group: usersToGroups?.find((userToGroup) => userToGroup.group.id === reg.groupId)?.group,
-      mode: 'edit',
-    };
-  });
-
-  registrationForms.push({
-    key: 'create',
-    mode: 'create',
-  });
-
-  return registrationForms;
-};
-
-function SelectRegistrationDropdown({
-  usersToGroups,
-  selectedRegistrationFormKey,
-  registrations,
-  onSelectedRegistrationFormKeyChange,
-  multipleRegistrationData,
-  registrationFields,
-}: {
-  selectedRegistrationFormKey: string | undefined;
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-  onSelectedRegistrationFormKeyChange: (key: string) => void;
-  multipleRegistrationData: Record<
-    string,
-    {
-      data: GetRegistrationDataResponse | null | undefined;
-      loading: boolean;
-    }
-  >;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
-}) {
-  useEffect(() => {
-    // select the first registration if it exists
-    // and no registration form is selected
-    if (
-      registrations &&
-      registrations.length &&
-      registrations[0].id &&
-      !selectedRegistrationFormKey
-    ) {
-      const firstRegistrationId = sortRegistrationsByCreationDate(registrations)[0].id;
-
-      if (firstRegistrationId) {
-        onSelectedRegistrationFormKeyChange(firstRegistrationId);
-      }
-    }
-  }, [onSelectedRegistrationFormKeyChange, registrations, selectedRegistrationFormKey]);
-
-  const showRegistrationsSelect = (
-    registrations: GetRegistrationsResponseType | null | undefined,
-  ): boolean => {
-    // only show select when user has previously registered
-    return !!registrations && registrations.length > 0;
-  };
-
-  const getRegistrationTitle = ({
-    multipleRegistrationData,
-    registration,
-    registrationFields,
-  }: {
-    multipleRegistrationData: Record<
-      string,
-      {
-        data: GetRegistrationDataResponse | null | undefined;
-        loading: boolean;
-      }
-    >;
-    registration: GetRegistrationResponseType | null | undefined;
-    registrationFields: GetRegistrationFieldsResponse | null | undefined;
-  }) => {
-    const firstField = filterRegistrationFields(
-      registrationFields,
-      registration?.groupId ? 'group' : 'user',
-    )?.sort((a, b) => (a.fieldDisplayRank ?? 0) - (b.fieldDisplayRank ?? 0))[0];
-
-    if (!firstField) {
-      return '';
-    }
-
-    const registrationData = multipleRegistrationData[registration?.id || '']?.data;
-
-    if (!registrationData) {
-      return '';
-    }
-
-    return (
-      registrationData.find((data) => data.registrationFieldId === firstField.id)?.value ??
-      'Untitled'
-    );
-  };
-
-  const createOptionName = ({
-    index,
-    mode,
-    groupName,
-    multipleRegistrationData,
-    registration,
-    registrationFields,
-  }: {
-    multipleRegistrationData: Record<
-      string,
-      {
-        data: GetRegistrationDataResponse | null | undefined;
-        loading: boolean;
-      }
-    >;
-    registration: GetRegistrationResponseType | null | undefined;
-    registrationFields: GetRegistrationFieldsResponse | null | undefined;
-    mode: 'edit' | 'create';
-    index: number;
-    groupName?: string;
-  }) => {
-    if (mode === 'create') {
-      return 'Create a new proposal';
-    }
-
-    return `${index}. ${getRegistrationTitle({
-      multipleRegistrationData,
-      registration,
-      registrationFields,
-    })} ${groupName ? `[${groupName}]` : ''}`;
-  };
-
-  return (
-    showRegistrationsSelect(registrations) && (
-      <FlexColumn $gap="0.5rem">
-        <Label>Select Proposal</Label>
-        <Select
-          value={selectedRegistrationFormKey ?? ''}
-          options={createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => ({
-            id: form.key,
-            name: createOptionName({
-              multipleRegistrationData,
-              registration: form.registration,
-              registrationFields,
-              mode: form.mode,
-              index: idx + 1,
-              groupName: form.group?.name,
-            }),
-          }))}
-          placeholder="Select a Proposal"
-          onChange={onSelectedRegistrationFormKeyChange}
-        />
-      </FlexColumn>
-    )
-  );
-}
-
-const getDefaultValues = (registrationData: GetRegistrationDataResponse | null | undefined) => {
-  return registrationData?.reduce(
-    (acc, curr) => {
-      acc[curr.registrationFieldId] = curr.value;
-      return acc;
-    },
-    {} as Record<string, string>,
-  );
-};
-
-const filterRegistrationFields = (
-  registrationFields: GetRegistrationFieldsResponse | null | undefined,
-  client: 'user' | 'group',
-) => {
-  return registrationFields?.filter((field) => {
-    if (field.forGroup && client == 'group') {
-      return true;
-    }
-
-    if (field.forUser && client == 'user') {
-      return true;
-    }
-
-    return false;
-  });
-};
-
 function EventGroupsForm({
   groupCategories,
   usersToGroups,
@@ -696,162 +427,77 @@ function SelectEventGroup({
   );
 }
 
-function RegistrationForm({
-  registrationFields,
-  event,
-  multipleRegistrationData,
-  registrations,
-  selectedRegistrationFormKey,
-  user,
-  usersToGroups,
-  onRegistrationFormCreate,
-  onSelectedRegistrationFormKeyChange,
-  onStepComplete,
-}: {
-  registrations: GetRegistrationsResponseType | undefined | null;
-  usersToGroups: GetUsersToGroupsResponse | undefined | null;
-  selectedRegistrationFormKey: string | undefined;
-  multipleRegistrationData: Record<
-    string,
-    {
-      data: GetRegistrationDataResponse | null | undefined;
-      loading: boolean;
-    }
-  >;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
-  user: GetUserResponse | null | undefined;
-  event: GetEventResponse | null | undefined;
-  onRegistrationFormCreate?: (newRegistrationId: string) => void;
-  onSelectedRegistrationFormKeyChange: (key: string) => void;
-  onStepComplete?: () => void;
-}) {
-  const showRegistrationForm = ({
-    registrationId,
-    selectedRegistrationFormKey,
-  }: {
-    registrationId?: string;
-    selectedRegistrationFormKey?: string;
-  }) => {
-    if (selectedRegistrationFormKey === 'create' && !registrationId) {
-      // show create registration form
-      return true;
-    }
-
-    return registrationId === selectedRegistrationFormKey;
-  };
-
-  return (
-    <>
-      <SelectRegistrationDropdown
-        onSelectedRegistrationFormKeyChange={onSelectedRegistrationFormKeyChange}
-        registrations={registrations}
-        usersToGroups={usersToGroups}
-        selectedRegistrationFormKey={selectedRegistrationFormKey}
-        multipleRegistrationData={multipleRegistrationData}
-        registrationFields={registrationFields}
-      />
-      {createRegistrationForms({ registrations, usersToGroups }).map((form, idx) => {
-        return (
-          <DynamicRegistrationFieldsForm
-            show={showRegistrationForm({
-              selectedRegistrationFormKey,
-              registrationId: form.registration?.id,
-            })}
-            usersToGroups={usersToGroups}
-            registrationData={multipleRegistrationData[form.registration?.id || '']?.data}
-            key={idx}
-            user={user}
-            groupId={form.group?.id}
-            registrationFields={registrationFields}
-            registrationId={form.registration?.id}
-            mode={form.mode}
-            isLoading={multipleRegistrationData[form.registration?.id || '']?.loading}
-            event={event}
-            onRegistrationFormCreate={onRegistrationFormCreate}
-            onStepComplete={onStepComplete}
-          />
-        );
-      })}
-    </>
-  );
-}
-
-function DynamicRegistrationFieldsForm(props: {
+function RegistrationForm(props: {
   user: GetUserResponse | null | undefined;
   usersToGroups: GetUsersToGroupsResponse | null | undefined;
-  registrationFields: GetRegistrationFieldsResponse | null | undefined;
   registrationId: string | null | undefined;
   groupId: string | null | undefined;
   event: GetEventResponse | null | undefined;
-  show: boolean;
+  data: GetRegistrationsResponseType[number]['data'] | null | undefined;
   mode: 'edit' | 'create';
-  isLoading: boolean;
-  onRegistrationFormCreate?: (newRegistrationId: string) => void;
-  registrationData: GetRegistrationDataResponse | null | undefined;
   onStepComplete?: () => void;
 }) {
   const queryClient = useQueryClient();
-
-  // i want to differentiate between when a group is selected and it is not
-  // so i can show the correct registration fields
-  // i will use the selectedGroupId to do this
   const [selectedGroupId, setSelectedGroupId] = useState<string>('');
   const prevSelectGroupId = props.groupId ?? 'none';
+  const registrationData = dataSchema.safeParse(props.data ?? {});
+  const eventFields = fieldsSchema.safeParse(props.event?.fields);
+  const dataIsClean = registrationData.success && eventFields.success;
 
   const form = useForm({
-    defaultValues: useMemo(
-      () => getDefaultValues(props.registrationData),
-      [props.registrationData],
-    ),
+    defaultValues: dataIsClean
+      ? Object.entries(eventFields.data).reduce(
+          (acc, [key]) => {
+            acc[key] = registrationData.data[key]?.value?.toString() ?? '';
+            return acc;
+          },
+          {} as Record<string, string>,
+        )
+      : {},
     mode: 'all',
   });
 
   const {
     formState: { isSubmitting },
     handleSubmit,
-    reset,
   } = form;
 
-  useEffect(() => {
-    reset(getDefaultValues(props.registrationData));
-  }, [props.registrationData, reset]);
-
   const sortedRegistrationFields = useMemo(() => {
-    const regGroupId = selectedGroupId || prevSelectGroupId;
-    const client = regGroupId === 'none' ? 'user' : 'group';
-
-    const sortedFields = filterRegistrationFields(props.registrationFields || [], client);
-
-    // Sort by field_display_rank in ascending order
-    sortedFields?.sort((a, b) => (a.fieldDisplayRank || 0) - (b.fieldDisplayRank || 0));
+    if (!eventFields.success) {
+      return [];
+    }
 
-    return sortedFields;
-  }, [props.registrationFields, selectedGroupId, prevSelectGroupId]);
+    return Object.values(eventFields.data)?.sort((a, b) => (a.position || 0) - (b.position || 0));
+  }, [eventFields]);
 
-  const { mutate: mutateRegistrationData, isPending } = useMutation({
+  const { mutate: mutateRegistration, isPending } = useMutation({
     mutationFn: postRegistration,
     onSuccess: async (body) => {
-      if (body) {
-        toast.success('Registration saved successfully!');
-        await queryClient.invalidateQueries({
-          queryKey: ['event', body.eventId, 'registrations'],
-        });
-        await queryClient.invalidateQueries({
-          queryKey: ['registrations', body.id, 'registration-data'],
-        });
+      if (!body) {
+        toast.error('Failed to save registration, please try again');
+        return;
+      }
 
-        // invalidate user registrations, this is for the 1 event use case
-        // where the authentication is because you are approved to the event
-        await queryClient.invalidateQueries({
-          queryKey: [props.user?.id, 'registrations'],
-        });
+      if ('errors' in body) {
+        toast.error(body.errors[0]);
+        return;
+      }
 
-        props.onRegistrationFormCreate?.(body.id);
+      toast.success('Registration saved successfully!');
+      await queryClient.invalidateQueries({
+        queryKey: ['event', body.eventId, 'registrations'],
+      });
+      await queryClient.invalidateQueries({
+        queryKey: ['registrations', body.id, 'registration-data'],
+      });
 
-        props.onStepComplete?.();
-      } else {
-        toast.error('Failed to save registration, please try again');
-      }
+      // invalidate user registrations, this is for the 1 event use case
+      // where the authentication is because you are approved to the event
+      await queryClient.invalidateQueries({
+        queryKey: [props.user?.id, 'registrations'],
+      });
+
+      props.onStepComplete?.();
     },
     onError: (error) => {
       console.error('Error saving registration:', error);
@@ -859,23 +505,29 @@ function DynamicRegistrationFieldsForm(props: {
     },
   });
 
-  const { mutate: updateRegistrationData } = useMutation({
+  const { mutate: updateRegistration } = useMutation({
     mutationFn: putRegistration,
     onSuccess: async (body) => {
-      if (body) {
-        toast.success('Registration updated successfully!');
-
-        await queryClient.invalidateQueries({
-          queryKey: ['event', props.event?.id, 'registrations'],
-        });
-        await queryClient.invalidateQueries({
-          queryKey: ['registrations', props.registrationId, 'registration-data'],
-        });
-
-        props.onStepComplete?.();
-      } else {
+      if (!body) {
         toast.error('Failed to update registration, please try again');
+        return;
       }
+
+      if ('errors' in body) {
+        toast.error(body.errors[0]);
+        return;
+      }
+
+      toast.success('Registration updated successfully!');
+
+      await queryClient.invalidateQueries({
+        queryKey: ['event', props.event?.id, 'registrations'],
+      });
+      await queryClient.invalidateQueries({
+        queryKey: ['registrations', props.registrationId, 'registration-data'],
+      });
+
+      props.onStepComplete?.();
     },
     onError: (error) => {
       console.error('Error updating registration:', error);
@@ -884,86 +536,66 @@ function DynamicRegistrationFieldsForm(props: {
   });
 
   const onSubmit = (values: Record<string, string>) => {
+    if (!dataIsClean) {
+      console.log('Data is not clean');
+      return;
+    }
+
     const regGroupId = selectedGroupId || prevSelectGroupId;
     const client = regGroupId === 'none' ? 'user' : 'group';
 
     // Filter out empty values
     const filteredValues = Object.entries(values).reduce(
       (acc, [key, value]) => {
-        if (value.trim() !== '') {
-          acc[key] = value.trim();
+        if (value !== '') {
+          acc[key] = value;
         }
         return acc;
       },
       {} as Record<string, string>,
     );
 
-    const registrationData = Object.entries(filteredValues).map(([key, value]) => ({
-      registrationFieldId: key,
-      value: value || '',
-    }));
+    const formattedData = Object.entries(filteredValues).reduce(
+      (acc, [key, value]) => {
+        acc[key] = {
+          value,
+          type: eventFields.data[key].type,
+          fieldId: eventFields.data[key].id,
+        };
+        return acc;
+      },
+      {} as z.infer<typeof dataSchema>,
+    );
 
     if (props.mode === 'edit') {
-      updateRegistrationData({
+      updateRegistration({
         registrationId: props.registrationId || '',
         body: {
           eventId: props.event?.id || '',
           groupId: client === 'user' ? null : regGroupId,
           status: 'DRAFT',
-          registrationData: registrationData,
+          data: formattedData,
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     } else {
-      mutateRegistrationData({
+      mutateRegistration({
         body: {
           eventId: props.event?.id || '',
           groupId: client === 'user' ? null : regGroupId,
           status: 'DRAFT',
-          registrationData: registrationData,
+          data: formattedData,
         },
         serverUrl: import.meta.env.VITE_SERVER_URL,
       });
     }
   };
 
-  if (props.isLoading) {
-    return (
-      props.show && (
-        <>
-          {sortedRegistrationFields?.map((_, idx) => (
-            <ContentLoader
-              key={idx}
-              speed={1.75}
-              width={'100%'}
-              height={80}
-              viewBox="0 0 100% 80"
-              backgroundColor="var(--color-gray)"
-              foregroundColor="var(--color-darkgray)"
-              {...props}
-            >
-              <rect x="0" y="0" rx="0" ry="0" width="100" height="22" />
-              <rect x="0" y="30" rx="4" ry="4" width="100%" height="50" />
-            </ContentLoader>
-          ))}
-          <ContentLoader
-            speed={1.75}
-            width={'100%'}
-            height={80}
-            viewBox="0 0 100% 80"
-            backgroundColor="var(--color-gray)"
-            foregroundColor="var(--color-darkgray)"
-            {...props}
-          >
-            <rect x="0" y="0" rx="8" ry="8" width="72" height="36" />
-            <rect x="0" y="52" rx="0" ry="0" width="100%" height="28" />
-          </ContentLoader>
-        </>
-      )
-    );
+  if (!eventFields.success) {
+    return <Subtitle>Failed to load registration fields</Subtitle>;
   }
 
-  return props.show ? (
+  return (
     <FlexColumn>
       <RegisterGroupSelect
         usersToGroups={props.usersToGroups}
@@ -978,11 +610,11 @@ function DynamicRegistrationFieldsForm(props: {
             form={form}
             name={regField.id}
             label={regField.name}
-            required={regField.required}
+            required={regField.validation.required}
             type={regField.type.toLocaleUpperCase()}
-            options={regField.registrationFieldOptions?.map((option) => ({
-              name: option.value,
-              value: option.value,
+            options={regField.options?.map((value) => ({
+              name: value,
+              value: value,
             }))}
           />
         ))}
@@ -991,8 +623,6 @@ function DynamicRegistrationFieldsForm(props: {
         Save
       </Button>
     </FlexColumn>
-  ) : (
-    <></>
   );
 }
 
diff --git a/packages/berlin/src/store/index.ts b/packages/berlin/src/store/index.ts
index 39d526d1..01653e5e 100644
--- a/packages/berlin/src/store/index.ts
+++ b/packages/berlin/src/store/index.ts
@@ -4,7 +4,6 @@ import { devtools, persist } from 'zustand/middleware';
 type COMPLETION_STATUS = 'COMPLETE' | 'INCOMPLETE';
 
 interface AppState {
-  userStatus: COMPLETION_STATUS;
   theme: 'light' | 'dark';
   availableHearts: {
     [questionId: string]: number;
@@ -14,7 +13,6 @@ interface AppState {
     cycle: COMPLETION_STATUS;
     results: COMPLETION_STATUS;
   };
-  setUserStatus: (status: COMPLETION_STATUS) => void;
   setAvailableHearts: ({ hearts, questionId }: { questionId: string; hearts: number }) => void;
   setOnboardingStatus: (
     type: keyof AppState['onboardingStatus'],
@@ -28,7 +26,6 @@ export const useAppStore = create<AppState>()(
   devtools(
     persist(
       (set) => ({
-        userStatus: 'INCOMPLETE',
         onboardingStatus: {
           event: 'INCOMPLETE',
           cycle: 'INCOMPLETE',
@@ -36,7 +33,6 @@ export const useAppStore = create<AppState>()(
         },
         theme: 'dark', // Default theme is dark
         availableHearts: {}, // Set the initial hearts value
-        setUserStatus: (status: COMPLETION_STATUS) => set(() => ({ userStatus: status })),
         setOnboardingStatus: (type, status) =>
           set((state) => ({
             onboardingStatus: {
@@ -49,8 +45,6 @@ export const useAppStore = create<AppState>()(
         toggleTheme: () => set((state) => ({ theme: state.theme === 'light' ? 'dark' : 'light' })),
         reset: () =>
           set(() => ({
-            userStatus: 'INCOMPLETE',
-            eventRegistrationStatus: 'INCOMPLETE',
             availableHearts: {},
           })),
       }),
@@ -59,7 +53,6 @@ export const useAppStore = create<AppState>()(
         // Partialize the store to only persist the required keys
         partialize: (state) => ({
           onboardingStatus: state.onboardingStatus,
-          userStatus: state.userStatus,
           theme: state.theme,
         }),
       },
diff --git a/packages/berlin/src/utils/form-validation.ts b/packages/berlin/src/utils/form-validation.ts
new file mode 100644
index 00000000..5a0b47fa
--- /dev/null
+++ b/packages/berlin/src/utils/form-validation.ts
@@ -0,0 +1,46 @@
+import { z } from 'zod';
+
+/**
+ * Fields schema
+ */
+
+const fieldType = z.enum(['TEXT', 'TEXTAREA', 'SELECT', 'CHECKBOX', 'MULTI_SELECT', 'NUMBER']);
+
+export const fieldSchema = z.object({
+  id: z.string().uuid(),
+  name: z.string(),
+  description: z.string().optional(),
+  type: fieldType,
+  position: z.coerce.number(),
+  options: z.array(z.string()).optional(),
+  validation: z.object({
+    required: z.boolean(),
+    minLength: z.coerce.number().optional().nullable(),
+    maxLength: z.coerce.number().optional().nullable(),
+  }),
+});
+
+// [fieldId] => { ...fieldSchema }
+export const fieldsSchema = z.record(z.string().uuid(), fieldSchema);
+
+/**
+ * Data Schema
+ */
+
+const dataValueSchema = z.union([
+  z.string(),
+  z.number(),
+  z.boolean(),
+  z.array(z.string()), // For multi-select fields
+  z.null(), // In case of optional fields
+]);
+
+// Define a schema for a single field
+const dataForOneFieldSchema = z.object({
+  value: dataValueSchema,
+  fieldId: z.string().uuid(),
+  type: fieldType,
+});
+
+// [fieldId] => { value: [value], fieldId: [fieldId] }
+export const dataSchema = z.record(z.string().uuid(), dataForOneFieldSchema);
diff --git a/packages/berlin/src/utils/formatGroups.ts b/packages/berlin/src/utils/formatGroups.ts
deleted file mode 100644
index f045b78a..00000000
--- a/packages/berlin/src/utils/formatGroups.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { GetGroupsResponse } from 'api';
-
-/**
- * Formats an array of group objects by sorting alphabetically and placing "Other" and "None" at the beginning.
- * @param groups An array of group objects.
- * @returns An array of formatted group objects with "Other" and "None" placed at the beginning.
- */
-export const formatGroups = (groups: GetGroupsResponse[] | null | undefined) => {
-  return (
-    groups
-      ?.sort((a, b) => a.name.localeCompare(b.name))
-      ?.reduce((acc: { name: string; id: string }[], group) => {
-        if (group.name === 'Other' || group.name === 'None') {
-          acc.unshift({ name: group.name, id: group.id });
-        } else {
-          acc.push({ name: group.name, id: group.id });
-        }
-        return acc;
-      }, []) || []
-  );
-};
diff --git a/packages/berlin/src/utils/validation.ts b/packages/berlin/src/utils/zod-error-handler.ts
similarity index 100%
rename from packages/berlin/src/utils/validation.ts
rename to packages/berlin/src/utils/zod-error-handler.ts