diff --git a/package-lock.json b/package-lock.json
index 5d0f7b3..8b27bf8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,16 @@
         "firebase": "^9.10.0",
         "formik": "^2.2.9",
         "fs": "^0.0.1-security",
+<<<<<<< HEAD
+        "husky": "^8.0.3",
+        "next": "12.3.0",
+=======
         "next": "^13.1.6",
+<<<<<<< HEAD
+>>>>>>> 63bc6ff82cd25db678c92cab9f225c8bec8882c8
+=======
         "next-redux-wrapper": "^8.1.0",
+>>>>>>> 57a9722d7a092c7a016a0ccbb0989fbc2eb4c99d
         "papaparse": "^5.3.2",
         "react": "18.2.0",
         "react-dom": "18.2.0",
@@ -15190,11 +15198,32 @@
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
       "dev": true
     },
+<<<<<<< HEAD
+    "node_modules/husky": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.3.tgz",
+      "integrity": "sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==",
+      "bin": {
+        "husky": "lib/bin.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
+      }
+    },
+    "node_modules/idb": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/idb/-/idb-7.0.1.tgz",
+      "integrity": "sha512-UUxlE7vGWK5RfB/fDwEGgRf84DY/ieqNha6msMV99UsEMQhJ1RwbCd8AYBj3QMgnE3VZnfQvm4oKVCJTYlqIgg=="
+=======
     "istanbul-lib-coverage": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
       "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true
+>>>>>>> 63bc6ff82cd25db678c92cab9f225c8bec8882c8
     },
     "istanbul-lib-instrument": {
       "version": "5.2.1",
diff --git a/src/components/ManagerComponents/userCard/UserForm.tsx b/src/components/ManagerComponents/userCard/UserForm.tsx
index f18ee16..961ff39 100644
--- a/src/components/ManagerComponents/userCard/UserForm.tsx
+++ b/src/components/ManagerComponents/userCard/UserForm.tsx
@@ -2,7 +2,7 @@ import { Formik, Form, FormikHelpers, FormikValues } from 'formik'
 import { Stack, Button } from '@mui/material'
 
 import * as Yup from 'yup'
-import { TextInput } from '../../shared/forms/CustomFormikFields' //, SelectInput
+import { TextInput, SelectInput } from '../../shared/forms/CustomFormikFields' //, SelectInput
 import {
   selectUserById,
   useAddNewUserMutation,
@@ -14,6 +14,7 @@ import React from 'react'
 import { RootState } from '../../../store/store'
 import { EntityId } from '@reduxjs/toolkit'
 import { User } from '../../../types/schema'
+import { generatePinNumber } from '../../../firebase/helpers'
 // import { useUserContext } from '../../../context/UserContext'
 
 //** Yup allows us to define a schema, transform a value to match, and/or assert the shape of an existing value. */
@@ -34,23 +35,9 @@ const UserSchema = Yup.object({
   runningTotalPenatlyHours: Yup.number(),
 })
 
-// const daysList = [
-//   '',
-//   'Monday',
-//   'Tuesday',
-//   'Wednesday',
-//   'Thursday',
-//   'Friday',
-//   'Saturday',
-//   'Sunday',
-// ]
-
-// const userCategories = [
-//   'cook dinner',
-//   'clean bathroom',
-//   'wash dishes',
-//   'clean basement',
-// ]
+const houseIDs = ['EUC', 'CLO']
+
+const userRoles = ['member', 'manager']
 
 const emptyUser = {
   // Role of the user
@@ -100,6 +87,7 @@ const UserForm = ({
   setOpen: (value: React.SetStateAction<boolean>) => void
   userId?: string
   isNewUser: boolean
+  pinNumber?: number
 }) => {
   // const { authUser, house } = useUserContext()
   // const [currentUser, setCurrentUser] = React.useState(User)
@@ -136,7 +124,7 @@ const UserForm = ({
     formikBag: FormikHelpers<any>
   ) => {
     // console.log('Submiting UserForm: ', values)
-    const { firstName, lastName, displayName, email } = values
+    const { firstName, lastName, displayName, email, role, houseID } = values
 
     // console.log(dayjs('1900', 'HHmm').format('HHmm'))
     // const num = 1900
@@ -146,16 +134,21 @@ const UserForm = ({
     let result
 
     const data = { data: {}, houseId: '', userId: '' }
+    const pinNumber = generatePinNumber(5)
     data.data = {
       firstName,
       lastName,
       displayName,
       email,
+      role,
+      houseID,
+      pinNumber,
     }
-    data.houseId = 'EUC'
+    // data.houseId = 'EUC'
     data.userId = userId ? userId : ''
     // console.log('data: ', data)
     if (isNewUser || !userId) {
+      console.log('Adds user works')
       result = await addNewUser(data)
     } else {
       result = await updateUser(data)
@@ -166,6 +159,7 @@ const UserForm = ({
 
     formikBag.resetForm()
     setOpen(false)
+    console.log(data)
   }
 
   // React.useEffect(() => {
@@ -182,6 +176,7 @@ const UserForm = ({
           displayName: user ? user.displayName : emptyUser.displayName,
           email: user ? user.email : emptyUser.email,
           role: user ? user.role : emptyUser.role,
+          houseID: user ? user.houseID : emptyUser.houseID,
         }}
         onSubmit={onSubmit}
       >
@@ -191,6 +186,20 @@ const UserForm = ({
             <TextInput name="lastName" label="Last Name" />
             <TextInput name="displayName" label="Display Name" />
             <TextInput name="email" label="Email" />
+            <SelectInput
+              name="role"
+              label="Role"
+              labelid="role"
+              id="role"
+              options={userRoles}
+            />
+            <SelectInput
+              name="houseID"
+              label="House ID"
+              labelid="houseID"
+              id="houseID"
+              options={houseIDs}
+            />
 
             <Stack direction="row" alignItems="center" spacing={2}>
               <Button
diff --git a/src/pages/manager/members/index.tsx b/src/pages/manager/members/index.tsx
new file mode 100644
index 0000000..eee2140
--- /dev/null
+++ b/src/pages/manager/members/index.tsx
@@ -0,0 +1,14 @@
+import { Button, Typography } from '@mui/material'
+import Layout from '../../../components/Layout/Layout'
+import NewUserCard from '../../../components/ManagerComponents/userCard/NewUserCard'
+
+export default function memberPage() {
+  return (
+    <Layout>
+      <Typography variant="h4" color={'#000'}>
+        Members
+      </Typography>
+      <NewUserCard />
+    </Layout>
+  )
+}
diff --git a/src/pages/manager/planner/UnassignedTabContent.tsx b/src/pages/manager/planner/UnassignedTabContent.tsx
index 4a0c7eb..8acccb1 100644
--- a/src/pages/manager/planner/UnassignedTabContent.tsx
+++ b/src/pages/manager/planner/UnassignedTabContent.tsx
@@ -37,6 +37,35 @@ const shiftHeadCells: HeadCell<
     label: 'Value',
     isSortable: true,
     align: 'left',
+<<<<<<< HEAD
+  },
+]
+
+const userHeadCells: HeadCell<
+  Shift & { [key in keyof Shift]: string | number }
+>[] = [
+  {
+    id: 'email',
+    isNumeric: false,
+    label: 'Email',
+    isSortable: true,
+    align: 'left',
+  },
+  {
+    id: 'hoursRequired',
+    isNumeric: true,
+    label: 'Hours Required',
+    isSortable: true,
+    align: 'left',
+  },
+  {
+    id: 'hoursAssigned',
+    isNumeric: true,
+    label: 'Value',
+    isSortable: true,
+    align: 'left',
+=======
+>>>>>>> 3304dd218d055e766ce5b32d47368969c8de4d32
   },
 ]