diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
new file mode 100644
index 0000000..acf504b
--- /dev/null
+++ b/.github/workflows/e2e.yml
@@ -0,0 +1,83 @@
+name: End-to-End Tests
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  e2e-testing:
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: '20.19.4' 
+
+    - name: Install Dependencies
+      run: |
+        npm install -g wait-on
+        npm ci 
+        cd client && npm ci
+        cd ../server && npm ci
+
+    - name: Install Playwright Browsers
+      run: npx playwright install --with-deps
+
+    - name: Start Express Server
+      env:
+        SUPABASE_URL: ${{ secrets.TEST_SUPABASE_URL }}
+        SUPABASE_SERVICE_ROLE_KEY: ${{ secrets.TEST_SUPABASE_SERVICE_ROLE_KEY }}
+        PORT: 5000
+      run: |
+        cd server
+        npm run start:ci-test & 
+        wait-on http://localhost:5000
+
+    - name: Start React Client
+      env:
+        REACT_APP_SUPABASE_URL: ${{ secrets.TEST_SUPABASE_URL }}
+        REACT_APP_SUPABASE_ANON_KEY: ${{ secrets.TEST_SUPABASE_ANON_KEY }}
+        PORT: 3000
+      run: |
+        cd client
+        npm run start:ci-test & 
+        wait-on http://localhost:3000
+
+    - name: Run Playwright Tests
+      run: npx playwright test
+      env:
+        SUPABASE_URL: ${{ secrets.TEST_SUPABASE_URL }}
+        SUPABASE_SERVICE_ROLE_KEY: ${{ secrets.TEST_SUPABASE_SERVICE_ROLE_KEY }}
+        
+    - name: Upload HTML report to Azure
+      if: always() 
+      shell: bash
+      run: |
+        # Creates a unique folder name for this specific test run
+        REPORT_DIR='run-${{ github.run_id }}-${{ github.run_attempt }}'
+        
+        # Uploads the report to the $web container
+        azcopy cp --recursive "./playwright-report/*" "https://kintree2026.blob.core.windows.net/\$web/$REPORT_DIR"
+        
+        # Prints a clickable link in the GitHub Actions logs
+        echo "::notice title=HTML report url::https://kintree2026.z13.web.core.windows.net/$REPORT_DIR/index.html"
+      env:
+        AZCOPY_AUTO_LOGIN_TYPE: SPN
+        AZCOPY_SPA_APPLICATION_ID: '${{ secrets.AZCOPY_SPA_APPLICATION_ID }}'
+        AZCOPY_SPA_CLIENT_SECRET: '${{ secrets.AZCOPY_SPA_CLIENT_SECRET }}'
+        AZCOPY_TENANT_ID: '${{ secrets.AZCOPY_TENANT_ID }}'
+
+    - name: Upload Playwright Report to GitHub Artifacts
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: playwright-report
+        path: playwright-report/
+        retention-days: 30
diff --git a/.gitignore b/.gitignore
index ff049cf..f660cd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ web_modules/
 .env
 .env.development.local
 .env.test.local
+.env.test
 .env.production.local
 .env.local
 
@@ -138,3 +139,10 @@ dist
 .yarn/install-state.gz
 .pnp.*
 client/src/components/AddToTree/sample-data.json
+
+# Playwright
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+/playwright/.auth/
diff --git a/README.md b/README.md
index 042658d..752ad01 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,35 @@ Then, from the same directory, run the following command to run the server/API:
 
 `node server.js`
 
+### Testing
+
+This project uses a separate test database to run tests against. Therefore, make sure to paste in the proper env variables.
+
+Paste `TEST_SUPABASE_URL` and `TEST_SUPABASE_SERVICE_ROLE_KEY` into a .env.test file in the root directory of the project. 
+
+Additionally, add `REACT_APP_SUPABASE_URL` and `REACT_APP_SUPABASE_ANON_KEY` to a .env.test file in the /client/ directory. 
+
+Finally, `SUPABASE_URL` and `SUPABASE_SERVICE_ROLE_KEY` should be added to the .env.test file in the /server/ directory as well.
+
+Tree structure:
+```
+/SeniorProject_KinTree
+  /client
+    .env.test
+  /server
+    .env.test
+  .env.test
+```
+
+Move into the /server/ directory and run `npm run start:dev-test` to setup the auth storage and test environment.
+
+Cd into the /client/ directory and run `npm run start:dev-test` to start the frontend in test mode.
+
+Then, navigate back to the /SeniorProject_KinTree/ root directory and run:
+
+`npm run test`
 ### Emails setup
 
 Follow the steps on [sending emails with Resend](https://github.com/resend/resend-examples/tree/main/express-resend-examples) to verify your domain and obtain your RESEND_API_KEY to store in `.env`.
 
-Set EMAIL_FROM in `.env`.
\ No newline at end of file
+Set EMAIL_FROM in `.env`.
diff --git a/TESTPLAN.md b/TESTPLAN.md
new file mode 100644
index 0000000..de37aae
--- /dev/null
+++ b/TESTPLAN.md
@@ -0,0 +1,429 @@
+# KinTree End-to-End Test Plan
+
+## 1. Purpose
+This plan documents the primary user flows in KinTree and defines how each flow should be tested. It is designed to guide Playwright UI tests plus supporting API/integration checks.
+
+## 2. Scope
+Application areas covered:
+- Authentication and account lifecycle
+- Profile management and account security
+- Family member management and relationship linking
+- Tree visualization and shared tree workflows
+- Family event dashboard
+- Settings, help, and chat pages
+
+## 3. Test Environments
+- Client app: http://localhost:3000
+- Server API: http://localhost:5000
+- Auth/storage provider: Supabase
+
+Baseline test users:
+- User A: existing registered account with at least one family member
+- User B: existing registered account not yet linked to User A
+- User C: account with shared trees received
+- User D: account with MFA enabled
+
+## 4. Flow Catalog
+
+### Flow 1: Register a New Account
+
+Routes:
+- /register
+- /login
+
+APIs touched:
+- POST /api/auth/sync
+
+Steps:
+1. Open /register.
+2. Fill required fields with valid values.
+3. Submit Create Account.
+4. Verify redirect to /login.
+
+Expected results:
+- Registration succeeds and account metadata is persisted.
+- Login page loads after registration.
+
+Negative coverage:
+- Invalid email format rejected.
+- Duplicate email returns visible error.
+
+### Flow 2: Login with Email and Password
+
+Routes:
+- /login
+
+Auth behavior:
+- Optional remember-me (stores email in local storage)
+- Optional MFA challenge for users with verified TOTP
+
+Steps:
+1. Open /login.
+2. Enter valid credentials.
+3. Submit Sign In.
+
+Expected results:
+- Successful users land on /.
+- 'Remember me' restores saved email on next login screen load.
+
+Negative coverage:
+- Invalid credentials show error text.
+- Protected routes redirect to /login if not authenticated.
+
+### Flow 3: Login with MFA (TOTP)
+
+Routes:
+- /login
+
+Auth behavior:
+- If a verified TOTP factor exists, user must verify a 6-digit code.
+
+Steps:
+1. Login with valid username/password for MFA-enabled account.
+2. Verify MFA challenge UI appears.
+3. Enter valid TOTP code and submit.
+
+Expected results:
+- User is redirected to / after successful verification.
+
+Negative coverage:
+- Invalid code shows verification error and remains on MFA step.
+
+### Flow 4: Password Reset and Update Password
+
+Routes:
+- /reset-password
+- /update-password
+- /login
+
+Steps:
+1. Open /reset-password and submit a valid email.
+2. Follow reset link to /update-password.
+3. Enter a valid new password and submit.
+4. Re-authenticate at /login with new password.
+
+Expected results:
+- Reset request shows success message.
+- Password update succeeds and redirects to /login.
+- New password works for login.
+
+### Flow 5: View Own Profile Data
+
+Routes:
+- /account/:id (own id)
+
+APIs touched:
+- GET /api/auth/user/email/:email
+- GET /api/auth/user/:id
+
+Steps:
+1. Navigate to own account page.
+2. Verify profile, personal info, and address sections render.
+
+Expected results:
+- Profile fields are populated from database values.
+- Page loads without fallback errors.
+
+### Flow 6: Edit Own Profile and Persist Changes
+
+Routes:
+- /account/:id
+
+APIs touched:
+- PUT /api/auth/profile
+- POST /api/auth/upload-profile-picture
+
+Steps:
+1. Enter edit mode for profile/personal/address sections.
+2. Update fields and save.
+3. Refresh page.
+
+Expected results:
+- Saved values persist after refresh.
+- Success feedback is shown.
+
+Negative coverage:
+- Oversized image upload rejected.
+- Non-image upload rejected.
+
+### Flow 7: Manage Account Security (MFA + Email Verification)
+
+Routes:
+- /account/:id (own account)
+
+Steps:
+1. Start authenticator setup.
+2. Scan QR or use pending setup and enter TOTP code.
+3. Verify authenticator status becomes enabled.
+4. Disable authenticator and verify status toggles.
+5. If email unverified, trigger resend verification email.
+
+Expected results:
+- MFA state transitions are correct and visible.
+- Verification resend returns success status.
+
+### Flow 8: Delete Account
+
+Routes:
+- /account/:id
+- /login
+
+APIs touched:
+- DELETE /api/auth/remove/:id
+
+Steps:
+1. Open own account page.
+2. Click Delete account.
+3. Confirm deletion in modal.
+
+Expected results:
+- Account and related data are removed.
+- User is logged out and redirected to /login.
+
+Negative coverage:
+- Backend failure surfaces user-visible error and keeps modal flow recoverable.
+
+### Flow 9: View Family Directory and Open Member Profile
+
+Routes:
+- /family
+- /account/:id
+
+APIs touched:
+- GET /api/family-members/user/:userId
+
+Steps:
+1. Open /family.
+2. Search for a member by first/last name.
+3. Sort list and verify ordering.
+4. Open member profile with View link.
+
+Expected results:
+- Matching members appear in list.
+- Navigation lands on target member profile.
+
+### Flow 10: Add Existing User as Family Member
+
+Routes:
+- /tree (Add Family Member popup)
+- /account/:id
+
+APIs touched:
+- GET /api/family-members/user/:userId
+- GET /api/auth/users
+- GET /api/family-members/active/:id
+- POST /api/family-members
+- POST /api/relationships
+
+Steps:
+1. Open tree page and launch Add Family Member popup.
+2. Search and select an existing registered user.
+3. Choose relationship type (and maternal/paternal side when required).
+4. Submit add.
+
+Expected results:
+- New tree member record is created.
+- Relationship record is created.
+- User is redirected to selected member profile.
+
+Negative coverage:
+- Cannot add self.
+- Cannot add a duplicate existing family member.
+
+### Flow 11: Add Manual (Non-Registered) Family Member
+
+Routes:
+- /tree (Add Family Member popup)
+- /account/:id
+
+APIs touched:
+- GET /api/family-members/active/:id
+- POST /api/family-members
+- POST /api/relationships
+
+Steps:
+1. In Add Family Member popup, switch to manual mode.
+2. Enter member details and relationship.
+3. Submit add.
+
+Expected results:
+- Member is created with no linked user account.
+- Relationship is created.
+- User can edit the family member.
+
+### Flow 12: Remove Family Member.
+
+Routes:
+- /account/:id
+
+APIs touched:
+- GET /api/tree-info/:id
+- GET /api/family-members/active/:id
+- POST /api/family-members
+- DELETE /api/relationships
+
+Steps:
+1. Open /family.
+2. Click on a member's 'View' button to open their account details.
+3. Submit and verify delete.
+
+Expected results:
+- Family member is removed from the tree and user's family page.
+- Tree and member persist on failure with visible error message.
+
+### Flow 13: Share Tree with Another Member
+
+Routes:
+- /tree/sharetree
+
+APIs touched:
+- GET /api/family-members/user/:userId
+- GET /api/auth/users
+- GET /api/tree-info/:id
+- POST /api/share-trees/share
+
+Steps:
+1. Open share tree page.
+2. Search/select a family member or send through email.
+3. Submit share.
+
+Expected results:
+- Shared tree record is created.
+- Email is sent if selected.
+- Sender is redirected to home/dashboard.
+
+Negative coverage:
+- Missing required selected member or email blocks submit.
+
+### Flow 14: View Incoming Shared Trees and Open One
+
+Routes:
+- /tree/viewsharedtrees
+- /sharedtree/:id
+
+APIs touched:
+- GET /api/share-trees/receiver/:id
+- GET /api/auth/users
+- GET /api/share-trees/:id
+
+Steps:
+1. Login as receiving user.
+2. Open shared trees list page.
+3. Verify list includes incoming shares.
+4. Click View Tree for a share.
+
+Expected results:
+- Receiver can navigate to shared tree view.
+- Sender identity and tree content display.
+
+### Flow 15: View Relationship Badge on Another User Profile
+
+Routes:
+- /account/:id (other user)
+
+APIs touched:
+- GET /api/relationships/between/:viewerId/:profileId
+
+Steps:
+1. Open profile of another user/family member.
+2. Observe relationship tag.
+
+Expected results:
+- Relationship badge appears for linked members.
+- Missing relationship returns neutral UI without crash.
+
+### Flow 16: Event Dashboard CRUD
+
+Routes:
+- /
+- /useractivitydash
+
+APIs touched:
+- GET /api/events/:auth_uid
+- POST /api/events
+- PUT /api/events/:id
+- DELETE /api/events/:id
+
+Steps:
+1. Open dashboard and create a new event.
+2. Verify event appears in list.
+3. Edit event and verify updates.
+4. Delete event and verify removal.
+5. Search by title/date and toggle sort order.
+
+Expected results:
+- CRUD operations persist correctly.
+- Search and sort update list presentation as expected.
+
+### Flow 17: Backup and Restore (Unimplemented)
+
+Routes:
+- Backend/API flow (UI trigger pending in Settings)
+
+APIs touched:
+- POST /api/backup/:id
+- POST /api/backup/restore/:id
+
+Steps:
+1. Trigger backup for test user.
+2. Mutate user family data.
+3. Trigger restore.
+4. Re-open family/tree views and verify restoration.
+
+Expected results:
+- Backup payload captures account-related records.
+- Restore rehydrates prior data snapshot.
+
+### Flow 17A: Merge Shared Tree Members and Assign Relationships (Unimplemented)
+
+Routes:
+- /sharedtree/:id
+
+APIs touched:
+- POST /api/share-trees/merge/:sharedTreeId
+- POST /api/share-trees/assign-relationship
+
+Steps:
+1. Open a shared tree as the receiver.
+2. Select shared members to merge into receiver base tree.
+3. Submit merge request.
+4. Assign relationship types to newly merged members.
+
+Expected results:
+- Merged members are persisted to receiver data.
+- Relationship assignments are saved and reflected in tree/profile views.
+
+Negative coverage:
+- Empty merge selection is rejected.
+- Invalid sharedTreeId returns handled error.
+
+### Flow 18: Navigation and Informational Pages
+
+Routes:
+- /websitesettings
+- /help
+- /chat
+
+Steps:
+1. Open each route as authenticated user.
+2. Verify core page sections load and navigation remains functional.
+
+Expected results:
+- Settings renders controls (including dark mode toggle).
+- Help FAQ content is visible.
+- Chat placeholder content is visible.
+
+## 5. Cross-Cutting Assertions
+Apply these checks in most UI flows:
+- Auth guard behavior for protected routes
+- User-friendly error messaging for failed API requests
+- No console exceptions that break flow completion (crash)
+
+## 6. Traceability Matrix (Route/API to Flow)
+- Auth and account: Flows 1-8
+- Family and profile viewing: Flows 9, 15
+- Tree and membership: Flows 10-12
+- Shared trees: Flows 13-14
+- Events: Flow 16
+- Backup/restore and shared merge operations: Flows 17-17A
+- Support/settings placeholders: Flow 18
diff --git a/client/.gitignore b/client/.gitignore
index 9fcb689..98c2430 100644
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -16,6 +16,7 @@
 .env.local
 .env.development.local
 .env.test.local
+.env.test
 .env.production.local
 project-root/.env
 npm-debug.log*
diff --git a/client/package-lock.json b/client/package-lock.json
index 2d46024..76e39be 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -28,7 +28,9 @@
                 "yup": "^1.6.1"
             },
             "devDependencies": {
-                "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+                "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+                "cross-env": "^10.1.0",
+                "env-cmd": "^11.0.0"
             }
         },
         "node_modules/@adobe/css-tools": {
@@ -2464,6 +2466,12 @@
                 "postcss-selector-parser": "^6.0.10"
             }
         },
+        "node_modules/@epic-web/invariant": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
+            "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
+            "dev": true
+        },
         "node_modules/@eslint-community/eslint-utils": {
             "version": "4.4.0",
             "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -7054,6 +7062,23 @@
                 "node": ">=10"
             }
         },
+        "node_modules/cross-env": {
+            "version": "10.1.0",
+            "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
+            "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==",
+            "dev": true,
+            "dependencies": {
+                "@epic-web/invariant": "^1.0.0",
+                "cross-spawn": "^7.0.6"
+            },
+            "bin": {
+                "cross-env": "dist/bin/cross-env.js",
+                "cross-env-shell": "dist/bin/cross-env-shell.js"
+            },
+            "engines": {
+                "node": ">=20"
+            }
+        },
         "node_modules/cross-spawn": {
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -8435,6 +8460,41 @@
                 "url": "https://github.com/fb55/entities?sponsor=1"
             }
         },
+        "node_modules/env-cmd": {
+            "version": "11.0.0",
+            "resolved": "https://registry.npmjs.org/env-cmd/-/env-cmd-11.0.0.tgz",
+            "integrity": "sha512-gnG7H1PlwPqsGhFJNTv68lsDGyQdK+U9DwLVitcj1+wGq7LeOBgUzZd2puZ710bHcH9NfNeGWe2sbw7pdvAqDw==",
+            "dev": true,
+            "dependencies": {
+                "@commander-js/extra-typings": "^13.1.0",
+                "commander": "^13.1.0",
+                "cross-spawn": "^7.0.6"
+            },
+            "bin": {
+                "env-cmd": "bin/env-cmd.js"
+            },
+            "engines": {
+                "node": ">=20.10.0"
+            }
+        },
+        "node_modules/env-cmd/node_modules/@commander-js/extra-typings": {
+            "version": "13.1.0",
+            "resolved": "https://registry.npmjs.org/@commander-js/extra-typings/-/extra-typings-13.1.0.tgz",
+            "integrity": "sha512-q5P52BYb1hwVWE6dtID7VvuJWrlfbCv4klj7BjUUOqMz4jbSZD4C9fJ9lRjL2jnBGTg+gDDlaXN51rkWcLk4fg==",
+            "dev": true,
+            "peerDependencies": {
+                "commander": "~13.1.0"
+            }
+        },
+        "node_modules/env-cmd/node_modules/commander": {
+            "version": "13.1.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
+            "integrity": "sha512-/rFeCpNJQbhSZjGVwO9RFV3xPqbnERS8MmIQzCtD/zl6gpJuV/bMLuN92oG3F7d8oDEHHRrujSXNUr8fpjntKw==",
+            "dev": true,
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/error-ex": {
             "version": "1.3.2",
             "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
diff --git a/client/package.json b/client/package.json
index f0b2061..72630a1 100644
--- a/client/package.json
+++ b/client/package.json
@@ -24,6 +24,8 @@
     },
     "scripts": {
         "start": "react-scripts start",
+        "start:ci-test": "react-scripts start",
+        "start:dev-test": "env-cmd -f .env.test react-scripts start",
         "build": "react-scripts build",
         "test": "react-scripts test",
         "eject": "react-scripts eject"
@@ -47,6 +49,8 @@
         ]
     },
     "devDependencies": {
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+        "cross-env": "^10.1.0",
+        "env-cmd": "^11.0.0"
     }
 }
diff --git a/client/src/components/AddFamilyMember/AddFamilyMember.js b/client/src/components/AddFamilyMember/AddFamilyMember.js
index 91e05a6..234877a 100644
--- a/client/src/components/AddFamilyMember/AddFamilyMember.js
+++ b/client/src/components/AddFamilyMember/AddFamilyMember.js
@@ -265,11 +265,12 @@ function AddFamilyMemberPopup({ trigger, userid }) {
 
       // Resolve relationships to create across the database
       // IMPORTANT: Use treeUserId (the member ID), not currentAccountID (the user ID)
+      const safeConnectTo = String(data.connectTo || '').startsWith('ghost_') ? null : data.connectTo;
       const relsToCreate = relationshipService.getRequiredDBRelationships(
         treeUserId,
         treeMemberId,
         data.selectedMemberRelationship,
-        data.connectTo,
+        safeConnectTo,
         data.matPat || null
       );
       
@@ -325,8 +326,8 @@ function AddFamilyMemberPopup({ trigger, userid }) {
         const dbLinkCount = relsToCreate.length;
         const mainRel = data.selectedMemberRelationship;
         let factualSummary = `Added as your ${mainRel.charAt(0).toUpperCase() + mainRel.slice(1)}`;
-        if (dbLinkCount > 1 && data.connectTo) {
-          const partnerName = treeInfo[data.connectTo]?.data["first name"] || "Partner";
+        if (dbLinkCount > 1 && safeConnectTo) {
+          const partnerName = treeInfo[safeConnectTo]?.data["first name"] || "Partner";
           factualSummary += ` and linked to ${partnerName}`;
         }
 
@@ -395,11 +396,12 @@ function AddFamilyMemberPopup({ trigger, userid }) {
 
       // Resolve relationships to create across the database
       // IMPORTANT: Use treeUserId (the member ID), not currentAccountID (the user ID)
+      const safeConnectTo2 = String(data.connectTo2 || '').startsWith('ghost_') ? null : data.connectTo2;
       const relsToCreate = relationshipService.getRequiredDBRelationships(
         treeUserId,
         treeMemberId,
         data.relationship,
-        data.connectTo2,
+        safeConnectTo2,
         data.matPat2 || null
       );
       
@@ -456,8 +458,8 @@ function AddFamilyMemberPopup({ trigger, userid }) {
         const dbLinkCount = relsToCreate.length;
         const mainRel = data.relationship;
         let factualSummary = `Added as your ${mainRel.charAt(0).toUpperCase() + mainRel.slice(1)}`;
-        if (dbLinkCount > 1 && data.connectTo2) {
-          const partnerName = treeInfo[data.connectTo2]?.data["first name"] || "Partner";
+        if (dbLinkCount > 1 && safeConnectTo2) {
+          const partnerName = treeInfo[safeConnectTo2]?.data["first name"] || "Partner";
           factualSummary += ` and linked to ${partnerName}`;
         }
 
diff --git a/client/src/pages/CreateAccount/CreateAccount.js b/client/src/pages/CreateAccount/CreateAccount.js
index 2a2c0f8..0075749 100644
--- a/client/src/pages/CreateAccount/CreateAccount.js
+++ b/client/src/pages/CreateAccount/CreateAccount.js
@@ -14,8 +14,13 @@ const yupValidation = yup.object().shape(
     {
         firstname: yup.string().required("First name is a required field."),
         lastname: yup.string().required("Last name is a required field."),
-        birthdate: yup.date().required("Birthdate is a required field."),
-        gender: yup.string().oneOf(['M', 'F'], 'Please select a valid option').required('Gender field is required'),
+        birthdate: yup
+            .date()
+            .transform((value, originalValue) => (originalValue === '' ? null : value))
+            .nullable()
+            .typeError("Birthdate is a required field.")
+            .required("Birthdate is a required field."),
+        gender: yup.string().oneOf(['M', 'F'], 'Gender field is required').required('Gender field is required'),
         email: yup.string().required("Email is a required field.")
             .matches(
                 "^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$"
@@ -217,8 +222,8 @@ const CreateAccount = () => {
                         </div>
                         <div style={styles.ItemStyle}>
                             <label>Gender
-                                <select id="gender" {...register("gender")} style={{ fontFamily: 'Alata', marginLeft: '10px', width: '145px' }}>
-                                    <option value="" disabled hidden>Select</option>
+                                <select id="gender" defaultValue="" {...register("gender")} style={{ fontFamily: 'Alata', marginLeft: '10px', width: '145px' }}>
+                                    <option value="" hidden>Select</option>
                                     <option value="M">Male</option>
                                     <option value="F">Female</option>
                                 </select>
diff --git a/client/src/pages/Reset/Reset.js b/client/src/pages/Reset/Reset.js
index 0aba72b..982f304 100644
--- a/client/src/pages/Reset/Reset.js
+++ b/client/src/pages/Reset/Reset.js
@@ -9,11 +9,13 @@ export default function ResetPassword() {
 
   const onSubmit = async (e) => {
     e.preventDefault();
+    // Make sure the confirmation message is displayed
+    setMessage('Check your email for a reset link.');
     try {
       await handleResetPassword(email);
-      setMessage('Check your email for a reset link.');
     } catch (error) {
-      // message handled by handler alert
+        // message handled by handler alert
+      setMessage('');
     }
   };
 
diff --git a/client/src/pages/Reset/UpdatePassword.js b/client/src/pages/Reset/UpdatePassword.js
index 6e83133..c3e5a64 100644
--- a/client/src/pages/Reset/UpdatePassword.js
+++ b/client/src/pages/Reset/UpdatePassword.js
@@ -75,7 +75,7 @@ export default function UpdatePassword() {
         <h1 style={styles.WelcomeHeader}>Update Password</h1>
         <p style={{ ...styles.Subtitle, marginBottom: '24px' }}>Enter your new password below.</p>
 
-        <form onSubmit={onSubmit} style={styles.FormStyle}>
+        <form onSubmit={onSubmit} style={styles.FormStyle} noValidate>
           {message && (
             <div style={{ color: '#059669', marginBottom: '20px', padding: '12px', backgroundColor: '#d1fae5', border: '1px solid #10b981', borderRadius: '10px', fontSize: '14px', textAlign: 'center' }}>
               {message}
@@ -94,7 +94,6 @@ export default function UpdatePassword() {
                   ...styles.FieldStyle,
                   paddingRight: '44px'
                 }}
-                required
               />
               <button
                 type="button"
diff --git a/client/src/services/relationshipService.js b/client/src/services/relationshipService.js
index d1d0498..a511b6a 100644
--- a/client/src/services/relationshipService.js
+++ b/client/src/services/relationshipService.js
@@ -43,22 +43,23 @@ export const relationshipService = {
         if (!userNode) return null;
 
         const parents = userNode.rels?.parents || [];
+        const isRealNode = (id) => !String(id).startsWith('ghost_');
 
         // CASE: Adding Mother when Father exists
         if (relationshipType === 'mother' && parents.length > 0) {
             // Find a parent who is Male
-            return parents.find(pId => treeInfo[pId]?.data?.gender === 'M') || parents[0];
+            return parents.find(pId => isRealNode(pId) && treeInfo[pId]?.data?.gender === 'M') || parents.find(isRealNode) || null;
         }
 
         // CASE: Adding Father when Mother exists
         if (relationshipType === 'father' && parents.length > 0) {
             // Find a parent who is Female
-            return parents.find(pId => treeInfo[pId]?.data?.gender === 'F') || parents[0];
+            return parents.find(pId => isRealNode(pId) && treeInfo[pId]?.data?.gender === 'F') || parents.find(isRealNode) || null;
         }
 
         // CASE: Adding Sibling
         if (["sibling", "sister", "brother"].includes(relationshipType)) {
-            return parents[0] || null; // Link to first available parent
+            return parents.find(isRealNode) || null; // Link to first available real parent
         }
 
         // CASE: Grandparents, Aunts, Uncles (Recursive through parents)
@@ -67,11 +68,11 @@ export const relationshipService = {
             
             if (side === "maternal") {
                 // Find Mother
-                return parents.find(pId => treeInfo[pId]?.data?.gender === 'F') || parents[0];
+                return parents.find(pId => isRealNode(pId) && treeInfo[pId]?.data?.gender === 'F') || parents.find(isRealNode) || null;
             }
             if (side === "paternal") {
                 // Find Father
-                return parents.find(pId => treeInfo[pId]?.data?.gender === 'M') || (parents[1] || parents[0]);
+                return parents.find(pId => isRealNode(pId) && treeInfo[pId]?.data?.gender === 'M') || parents.find(isRealNode) || null;
             }
         }
 
@@ -90,6 +91,7 @@ export const relationshipService = {
     getRequiredDBRelationships(currentUserId, newMemberId, relationshipType, connectToId, side = null) {
         const rels = [];
         const config = this.EXTENDED_RELATIONS[relationshipType];
+        const safeConnectToId = String(connectToId || '').startsWith('ghost_') ? null : connectToId;
         
         // 1. Specialized Logic for Mothers/Fathers
         if (relationshipType === 'mother' || relationshipType === 'father') {
@@ -102,9 +104,9 @@ export const relationshipService = {
             });
 
             // If a partner (connectToId) was found, ALSO link them as spouses
-            if (connectToId) {
+            if (safeConnectToId) {
                 rels.push({
-                    person1_id: connectToId,
+                    person1_id: safeConnectToId,
                     person2_id: newMemberId,
                     relationshipType: 'spouse',
                     side: null
@@ -113,10 +115,10 @@ export const relationshipService = {
         } 
         // 2. Specialized Logic for Siblings
         else if (["sibling", "sister", "brother"].includes(relationshipType)) {
-            if (connectToId) {
+            if (safeConnectToId) {
                 // Link sibling to the parent identified
                 rels.push({
-                    person1_id: connectToId,
+                    person1_id: safeConnectToId,
                     person2_id: newMemberId,
                     relationshipType: 'parent',
                     side: null
@@ -134,7 +136,7 @@ export const relationshipService = {
         // 3. Default Case (Spouse, Child, Grandparent, etc.)
         else {
              // If connectToId is provided, we map via that person
-             const target = connectToId || currentUserId;
+               const target = safeConnectToId || currentUserId;
              rels.push({
                 person1_id: target,
                 person2_id: newMemberId,
diff --git a/e2e/auth.setup.ts b/e2e/auth.setup.ts
new file mode 100644
index 0000000..1abf301
--- /dev/null
+++ b/e2e/auth.setup.ts
@@ -0,0 +1,47 @@
+import { test as setup, expect } from '@playwright/test';
+import { CreateAccountPage } from './pages/CreateAccount';
+import { LoginPage } from './pages/Login';
+
+const authFile = 'playwright/.auth/user.json';
+
+const registrationEmail = process.env.E2E_SETUP_EMAIL || `e2e-setup-${Date.now()}@example.com`;
+const registrationPassword = process.env.E2E_SETUP_PASSWORD || 'StrongPass1!';
+
+setup('authenticate', async ({ page }) => {
+  const createAccountPage = new CreateAccountPage(page);
+  const loginPage = new LoginPage(page);
+
+  // 1. Register a fresh account through the UI so app-side profile/schema setup runs.
+  await createAccountPage.goto();
+  await createAccountPage.expectLoaded();
+  await createAccountPage.fillForm({
+    firstname: 'E2E',
+    lastname: 'Setup',
+    birthdate: '1999-01-01',
+    gender: 'F',
+    email: registrationEmail,
+    country: 'USA',
+    password: registrationPassword,
+    address: '123 Test Lane',
+    city: 'Starkville',
+    state: 'MS',
+    zipcode: '39759',
+    phonenum: '6625550101',
+  });
+  await createAccountPage.submit();
+  await expect(page).toHaveURL(/\/login$/);
+
+  // 2. Login with the newly registered account.
+  await loginPage.expectLoaded();
+  await loginPage.login({
+    email: registrationEmail,
+    password: registrationPassword,
+  });
+
+  // 3. Wait for successful login redirect.
+  await page.waitForURL(/\/$/);
+  await expect(page.getByText(/Family Events/)).toBeVisible();
+
+  // 4. Save the cookies and local storage state to the file
+  await page.context().storageState({ path: authFile });
+});
\ No newline at end of file
diff --git a/e2e/flow1-registration.spec.js b/e2e/flow1-registration.spec.js
new file mode 100644
index 0000000..51ce707
--- /dev/null
+++ b/e2e/flow1-registration.spec.js
@@ -0,0 +1,142 @@
+import { test, expect } from '@playwright/test';
+import { CreateAccountPage } from './pages/CreateAccount';
+import { LoginPage } from './pages/Login';
+import { createClient } from '@supabase/supabase-js';
+
+// Initialize Supabase admin client for cleanup
+const supabase = createClient(
+  process.env.SUPABASE_URL,
+  process.env.SUPABASE_SERVICE_ROLE_KEY
+);
+
+const buildRegistrationData = (email) => ({
+	firstname: 'E2E',
+	lastname: 'Tester',
+	birthdate: '1999-01-01',
+	gender: 'F',
+	email,
+	country: 'USA',
+	password: 'StrongPass1!',
+});
+
+// This suite runs without logged in state
+test.use({ storageState: { cookies: [], origins: [] } });
+
+// Flow #1
+
+test.describe('Flow #1: Register a New Account', () => {
+
+	const testEmail = 'new-user@example.com';
+  	const duplicateEmail = 'existing-user@example.com';
+
+  	// Setup
+	test.beforeAll(async () => { 
+		const { data: { users } } = await supabase.auth.admin.listUsers();
+       // ensure clean slate
+       for (const email of [testEmail, duplicateEmail]) {
+          const user = users.find(u => u.email === email);
+          if (user) await supabase.auth.admin.deleteUser(user.id);
+        }
+		// for duplicate email test
+		await supabase.auth.admin.createUser({
+		email: duplicateEmail,
+		password: 'password123',
+		email_confirm: true,
+		});
+	});
+
+	// Cleanup, removes all test accs
+	test.afterAll(async () => {
+		const { data: { users } } = await supabase.auth.admin.listUsers();
+		
+		// Find and delete both test accounts if they exist
+		for (const email of [testEmail, duplicateEmail]) {
+		const user = users.find(u => u.email === email);
+		if (user) await supabase.auth.admin.deleteUser(user.id);
+		}
+	});
+
+
+	test('loads the create account form', async ({ page }) => {
+		const createAccountPage = new CreateAccountPage(page);
+
+		await createAccountPage.goto();
+		await createAccountPage.expectLoaded();
+		await expect(page).toHaveURL(/\/register$/);
+	});
+
+	test('navigates to login from the registration page', async ({ page }) => {
+		const createAccountPage = new CreateAccountPage(page);
+		const loginPage = new LoginPage(page);
+
+		await createAccountPage.goto();
+		await createAccountPage.expectLoaded();
+
+		await createAccountPage.loginLink.click();
+
+		await expect(page).toHaveURL(/\/login$/);
+		await loginPage.expectLoaded();
+	});
+
+	test('shows required-field validation when submitting an empty form', async ({ page }) => {
+		const createAccountPage = new CreateAccountPage(page);
+
+		await createAccountPage.goto();
+		await createAccountPage.submit();
+
+		await expect(page.getByText('First name is a required field.')).toBeVisible();
+		await expect(page.getByText('Last name is a required field.')).toBeVisible();
+		await expect(page.getByText('Birthdate is a required field.')).toBeVisible();
+		await expect(page.getByText('Gender field is required')).toBeVisible();
+		await expect(page.getByText('Email is a required field.')).toBeVisible();
+		await expect(page.getByText('Country of residence is a required field.')).toBeVisible();
+		await expect(page.getByText('Password is required')).toBeVisible();
+	});
+
+	test('shows email and password format validation errors for invalid inputs', async ({ page }) => {
+		const createAccountPage = new CreateAccountPage(page);
+
+		await createAccountPage.goto();
+		await createAccountPage.fillRequiredFields({
+			firstname: 'Test',
+			lastname: 'User',
+			birthdate: '1999-01-01',
+			gender: 'M',
+			email: 'invalid-email',
+			country: 'USA',
+			password: 'weak',
+		});
+
+		await createAccountPage.submit();
+
+		await expect(page.getByText('Invalid email format.')).toBeVisible();
+		await expect(
+			page.getByText('Must Contain 8 Characters, One Uppercase, One Lowercase, One Number and One Special Case Character')
+		).toBeVisible();
+	});
+
+	test('registers successfully and redirects to login', async ({ page }) => {		
+		const createAccountPage = new CreateAccountPage(page);
+		const loginPage = new LoginPage(page);
+		const email = testEmail;
+
+		await createAccountPage.goto();
+		await createAccountPage.fillRequiredFields(buildRegistrationData(email));
+		await createAccountPage.submit();
+
+		await expect(page).toHaveURL(/\/login$/);
+		await loginPage.expectLoaded();
+	});
+
+	test('shows an error when trying to register a duplicate email', async ({ page }) => {
+		const createAccountPage = new CreateAccountPage(page);
+		const email = duplicateEmail;
+
+		await createAccountPage.goto();
+		await createAccountPage.fillRequiredFields(buildRegistrationData(email));
+		await createAccountPage.submit();
+        await page.waitForURL(/\/register$/);
+		await expect(page).toHaveURL(/\/register$/);
+		await expect(page.getByText(/registered|exists|in use|already/i).first()).toBeVisible();
+	});
+});
diff --git a/e2e/flow10-existing-member.spec.js b/e2e/flow10-existing-member.spec.js
new file mode 100644
index 0000000..625f34f
--- /dev/null
+++ b/e2e/flow10-existing-member.spec.js
@@ -0,0 +1,87 @@
+import { test, expect } from '@playwright/test';
+import { deleteIfExists, getCurrentAccountId, seedRegisteredUser } from './helpers/flowSeeds';
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+const apiUrl = process.env.PLAYWRIGHT_API_URL || 'http://localhost:5000';
+const authFile = 'playwright/.auth/user.json';
+
+async function getTreeObject(page, apiUrl, accountId) {
+  const response = await page.request.get(`${apiUrl}/api/tree-info/${accountId}`);
+  expect(response.ok()).toBeTruthy();
+  const body = await response.json();
+  return Array.isArray(body.object) ? body.object : JSON.parse(body.object);
+}
+
+const uniqueSuffix = Date.now();
+const registeredUserSeed = {
+  email: `flow10-user-${uniqueSuffix}@example.com`,
+  password: 'ExistingPass1!',
+  firstname: 'FlowTen',
+  lastname: `User${uniqueSuffix}`,
+  birthdate: '1992-02-02',
+  gender: 'F',
+  address: '10 Test Lane',
+  city: 'Starkville',
+  state: 'MS',
+  country: 'USA',
+  zipcode: '39759',
+  phonenum: '6625550102',
+};
+
+test.use({ storageState: authFile });
+
+let currentAccountId;
+let seededRegisteredUser;
+
+test.beforeAll(async ({ browser }) => {
+  currentAccountId = await getCurrentAccountId(browser, authFile, appUrl);
+  seededRegisteredUser = await seedRegisteredUser(apiUrl, registeredUserSeed);
+});
+
+test.afterAll(async () => {
+  if (seededRegisteredUser?.dbUserId) {
+    await deleteIfExists(`${apiUrl}/api/auth/remove/${seededRegisteredUser.dbUserId}`);
+  }
+});
+
+test('Flow #10: add an existing registered user as a family member', async ({ page }) => {
+  await page.goto('/tree');
+
+  await page.locator('.tree-plus-button').click();
+  await expect(page.getByRole('heading', { name: /add family member/i })).toBeVisible();
+
+  const existingForm = page.locator('form').filter({ has: page.getByRole('heading', { name: /add family member/i }) });
+
+  await existingForm.getByPlaceholder('Search for a family member...').fill(seededRegisteredUser.email);
+  await expect(page.getByText(seededRegisteredUser.email)).toBeVisible();
+
+  await existingForm.locator(`input[type="radio"][value="${seededRegisteredUser.dbUserId}"]`).check();
+  await existingForm.getByLabel(/relationship/i).selectOption('sibling');
+  await existingForm.evaluate((form) => form.requestSubmit());
+
+  await expect(page.getByRole('heading', { name: /member added!/i })).toBeVisible();
+  await page.getByRole('button', { name: /return to tree/i }).click();
+  await expect(page).toHaveURL(/\/tree$/);
+  await expect(page.locator('#FamilyChart')).toContainText(
+    new RegExp(`${seededRegisteredUser.firstname}\\s*${seededRegisteredUser.lastname}`, 'i')
+  );
+
+  const treeObject = await getTreeObject(page, apiUrl, currentAccountId);
+  const inTreeObject = treeObject.some((node) => {
+    const first = node?.data?.['first name'] || node?.data?.firstname || '';
+    const last = node?.data?.['last name'] || node?.data?.lastname || '';
+    const fullName = node?.data?.name || `${first} ${last}`.trim();
+
+    return (
+      (first === seededRegisteredUser.firstname && last === seededRegisteredUser.lastname) ||
+      fullName.toLowerCase().includes(`${seededRegisteredUser.firstname} ${seededRegisteredUser.lastname}`.toLowerCase())
+    );
+  });
+  expect(inTreeObject).toBeTruthy();
+
+
+  await page.goto('/family');
+  await page.getByPlaceholder('Search for family members...').fill(seededRegisteredUser.lastname);
+
+  await expect(page.getByText(`${seededRegisteredUser.firstname} ${seededRegisteredUser.lastname}`)).toBeVisible();
+});
\ No newline at end of file
diff --git a/e2e/flow11-manual-member.spec.js b/e2e/flow11-manual-member.spec.js
new file mode 100644
index 0000000..3ba6d4b
--- /dev/null
+++ b/e2e/flow11-manual-member.spec.js
@@ -0,0 +1,74 @@
+import { test, expect } from '@playwright/test';
+import { deleteIfExists, getCurrentAccountId, seedManualFamilyMember } from './helpers/flowSeeds';
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+const apiUrl = process.env.PLAYWRIGHT_API_URL || 'http://localhost:5000';
+const authFile = 'playwright/.auth/user.json';
+
+async function getTreeObject(page, apiUrl, accountId) {
+  const response = await page.request.get(`${apiUrl}/api/tree-info/${accountId}`);
+  expect(response.ok()).toBeTruthy();
+  const body = await response.json();
+  return Array.isArray(body.object) ? body.object : JSON.parse(body.object);
+}
+
+const uniqueSuffix = Date.now();
+const manualMemberSeed = {
+  firstname: 'FlowEleven',
+  lastname: `Manual${uniqueSuffix}`,
+  birthdate: '1993-03-03',
+  deathdate: '',
+  location: 'Starkville',
+  phonenumber: '6625550104',
+  gender: 'M',
+};
+
+test.use({ storageState: authFile });
+
+let seededManualMember;
+let currentAccountId;
+
+test.beforeAll(async ({ browser }) => {
+  currentAccountId = await getCurrentAccountId(browser, authFile, appUrl);
+  seededManualMember = await seedManualFamilyMember(apiUrl, currentAccountId, manualMemberSeed);
+});
+
+test.afterAll(async () => {
+  if (seededManualMember?.id) {
+    await deleteIfExists(`${apiUrl}/api/family-members/${seededManualMember.id}`);
+  }
+});
+
+test('Flow #11: add a manual family member', async ({ page }) => {
+  await page.goto('/tree');
+
+  await page.locator('.tree-plus-button').click();
+  await expect(page.getByRole('heading', { name: /add family member/i })).toBeVisible();
+  await page.getByRole('button', { name: /can't find your family member\?/i }).click();
+
+  const manualForm = page.locator('form').filter({ has: page.getByRole('heading', { name: /manually add family member/i }) });
+
+  await manualForm.getByLabel(/first name/i).fill(manualMemberSeed.firstname);
+  await manualForm.getByLabel(/last name/i).fill(manualMemberSeed.lastname);
+  await manualForm.getByLabel(/gender/i).selectOption('M');
+  await manualForm.getByLabel(/relationship/i).selectOption('spouse');
+  await manualForm.evaluate((form) => form.requestSubmit());
+
+  await expect(page.getByRole('heading', { name: /member added!/i })).toBeVisible();
+
+  await page.getByRole('button', { name: /return to tree/i }).click();
+  await expect(page).toHaveURL(/\/tree$/);
+  await expect(page.locator('#FamilyChart')).toContainText(new RegExp(`${manualMemberSeed.firstname}\\s*${manualMemberSeed.lastname}`, 'i'));
+
+  const treeObject = await getTreeObject(page, apiUrl, currentAccountId);
+  const inTreeObject = treeObject.some((node) =>
+    node?.data?.['first name'] === manualMemberSeed.firstname &&
+    node?.data?.['last name'] === manualMemberSeed.lastname
+  );
+  expect(inTreeObject).toBeTruthy();
+
+  await page.goto('/family');
+  await page.getByPlaceholder('Search for family members...').fill(manualMemberSeed.lastname);
+
+  await expect(page.getByText(new RegExp(`${manualMemberSeed.firstname} ${manualMemberSeed.lastname}`, 'i')).first()).toBeVisible();
+});
\ No newline at end of file
diff --git a/e2e/flow12-remove-member.spec.js b/e2e/flow12-remove-member.spec.js
new file mode 100644
index 0000000..6d8c17e
--- /dev/null
+++ b/e2e/flow12-remove-member.spec.js
@@ -0,0 +1,113 @@
+import { test, expect } from '@playwright/test';
+import { getCurrentAccountId } from './helpers/flowSeeds';
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+const apiUrl = process.env.PLAYWRIGHT_API_URL || 'http://localhost:5000';
+const authFile = 'playwright/.auth/user.json';
+
+const uniqueSuffix = Date.now();
+const removableMemberSeed = {
+  firstname: 'FlowTwelve',
+  lastname: `Remove${uniqueSuffix}`,
+  birthdate: '1991-04-04',
+  deathdate: '',
+  location: 'Starkville',
+  phonenumber: '6625550105',
+  gender: 'F',
+};
+
+test.use({ storageState: authFile });
+
+let currentAccountId;
+
+async function getTreeObject(page, apiUrl, accountId) {
+  const response = await page.request.get(`${apiUrl}/api/tree-info/${accountId}`);
+  expect(response.ok()).toBeTruthy();
+  const body = await response.json();
+  return Array.isArray(body.object) ? body.object : JSON.parse(body.object);
+}
+
+test.beforeAll(async ({ browser }) => {
+  currentAccountId = await getCurrentAccountId(browser, authFile, appUrl);
+});
+
+test.afterAll(async () => {
+  if (!currentAccountId) {
+    return;
+  }
+
+  try {
+    const response = await fetch(`${apiUrl}/api/family-members/user/${currentAccountId}`);
+    if (!response.ok) return;
+    const members = await response.json();
+    const leftovers = (members || []).filter(
+      (member) =>
+        member?.firstname === removableMemberSeed.firstname &&
+        member?.lastname === removableMemberSeed.lastname
+    );
+
+    for (const member of leftovers) {
+      await fetch(`${apiUrl}/api/family-members/${member.id}`, { method: 'DELETE' });
+    }
+  } catch {
+  }
+});
+
+test('Flow #12: remove family member and verify treeinfo updates on tree page', async ({ page }) => {
+  await page.goto('/tree');
+
+  await page.locator('.tree-plus-button').click();
+  await expect(page.getByRole('heading', { name: /add family member/i })).toBeVisible();
+  await page.getByRole('button', { name: /can't find your family member\?/i }).click();
+
+  const manualForm = page.locator('form').filter({ has: page.getByRole('heading', { name: /manually add family member/i }) });
+  await manualForm.getByLabel(/first name/i).fill(removableMemberSeed.firstname);
+  await manualForm.getByLabel(/last name/i).fill(removableMemberSeed.lastname);
+  await manualForm.getByLabel(/gender/i).selectOption('F');
+  await manualForm.getByLabel(/relationship/i).selectOption('sibling');
+  const createMemberRequest = page.waitForResponse((response) => {
+    return response.request().method() === 'POST' && response.url().includes('/api/family-members');
+  });
+
+  await Promise.all([
+    createMemberRequest,
+    manualForm.evaluate((form) => form.requestSubmit()),
+  ]);
+
+  await expect(page.getByRole('heading', { name: /member added!/i })).toBeVisible({ timeout: 15000 });
+  await page.getByRole('button', { name: /return to tree/i }).click();
+  await expect(page).toHaveURL(/\/tree$/);
+
+  const memberNamePattern = new RegExp(`${removableMemberSeed.firstname}\\s*${removableMemberSeed.lastname}`, 'i');
+
+  await expect(page.locator('#FamilyChart')).toContainText(memberNamePattern);
+
+  const treeBefore = await getTreeObject(page, apiUrl, currentAccountId);
+  const existedBefore = treeBefore.some((node) =>
+    node?.data?.['first name'] === removableMemberSeed.firstname &&
+    node?.data?.['last name'] === removableMemberSeed.lastname
+  );
+  expect(existedBefore).toBeTruthy();
+
+  const targetCard = page.locator('#FamilyChart .card').filter({ hasText: memberNamePattern }).first();
+  await expect(targetCard.locator('.card-delete')).toHaveCount(1);
+  await targetCard.evaluate((card) => {
+    const deleteButton = card.querySelector('.card-delete');
+    if (!deleteButton) {
+      throw new Error('Delete button not found on target card.');
+    }
+    deleteButton.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+  });
+  await expect(page.getByText(/remove family member\?/i)).toBeVisible();
+  await page.getByRole('button', { name: /delete member/i }).click();
+
+  await expect(page.getByText(new RegExp(`Successfully removed ${removableMemberSeed.firstname} ${removableMemberSeed.lastname}`, 'i'))).toBeVisible();
+  await expect(page.locator('#FamilyChart')).not.toContainText(memberNamePattern);
+
+  const treeAfter = await getTreeObject(page, apiUrl, currentAccountId);
+  const existsAfter = treeAfter.some((node) =>
+    node?.data?.['first name'] === removableMemberSeed.firstname &&
+    node?.data?.['last name'] === removableMemberSeed.lastname
+  );
+  expect(existsAfter).toBeFalsy();
+});
\ No newline at end of file
diff --git a/e2e/flow16-events.spec.js b/e2e/flow16-events.spec.js
new file mode 100644
index 0000000..dced3fa
--- /dev/null
+++ b/e2e/flow16-events.spec.js
@@ -0,0 +1,51 @@
+import { test, expect } from '@playwright/test';
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+const authFile = 'playwright/.auth/user.json';
+
+test.use({ storageState: authFile });
+
+test('Flow 16: Event Dashboard CRUD', async ({ page }) => {
+  await page.goto('/');
+
+  // Ensure dashboard loaded
+  await expect(page.getByText(/Family Events/i)).toBeVisible();
+
+  // Create an event
+  const title = `E2E Event ${Date.now()}`;
+  const date = '2026-05-01';
+  const description = 'Created by Playwright Flow 16 test';
+
+  await page.getByRole('button', { name: /Create Event/i }).click();
+  await expect(page.getByRole('heading', { name: /Create New Event/i })).toBeVisible();
+
+  // Fill the form
+  await page.getByLabel(/Title/i).fill(title);
+  await page.getByLabel(/Date/i).fill(date);
+  await page.getByRole('textbox', { name: 'Add a description...' }).fill(description);
+
+  await page.getByRole('button', { name: /Post/i }).click();
+
+  // New event should appear in list
+  await expect(page.getByText(title)).toBeVisible();
+
+  // Edit the event: find the card and click Edit
+  const card = page.locator('h2', { hasText: title }).first().locator('..');
+  await card.getByRole('button', { name: /Edit/i }).click();
+  await expect(page.getByRole('heading', { name: /Edit Event/i })).toBeVisible();
+
+  const updatedTitle = `${title} (updated)`;
+  await page.getByLabel(/Title/i).fill(updatedTitle);
+  await page.getByRole('button', { name: /Save Changes/i }).click();
+
+  await expect(page.getByText(updatedTitle)).toBeVisible();
+
+  // Delete the event
+  // Accept the confirmation dialog that the app shows
+  page.on('dialog', async dialog => { await dialog.accept(); });
+  const updatedCard = page.locator('h2', { hasText: updatedTitle }).first().locator('..');
+  await updatedCard.getByRole('button', { name: /Delete/i }).click();
+
+  // Ensure it's removed from the list
+  await expect(page.getByText(updatedTitle)).not.toBeVisible();
+});
diff --git a/e2e/flow2-login.spec.js b/e2e/flow2-login.spec.js
new file mode 100644
index 0000000..c3062ef
--- /dev/null
+++ b/e2e/flow2-login.spec.js
@@ -0,0 +1,67 @@
+import { test, expect } from '@playwright/test';
+import { LoginPage } from './pages/Login';
+
+const validEmail = process.env.E2E_LOGIN_EMAIL || 'e2e-test@example.com';
+const validPassword = process.env.E2E_LOGIN_PASSWORD || 'test123!';
+
+// Flow #2 should verify unauthenticated and post-login behavior.
+test.use({ storageState: { cookies: [], origins: [] } });
+
+test.describe('Flow #2: Login with Email and Password', () => {
+	const protectedRoute = '/family';
+
+  test('signs in with valid credentials and redirects to home', async ({ page }) => {
+    const loginPage = new LoginPage(page);
+
+    await loginPage.goto();
+    await loginPage.expectLoaded();
+
+    await loginPage.login({ email: validEmail, password: validPassword });
+
+    await expect(page).toHaveURL(/\/$/);
+    await expect(page.getByText(/Family Events/i)).toBeVisible();
+  });
+
+  test('remember me restores saved email on next login load', async ({ page }) => {
+    const loginPage = new LoginPage(page);
+
+    await loginPage.goto();
+    await loginPage.expectLoaded();
+
+    await loginPage.fillCredentials({ email: validEmail, password: validPassword });
+    await loginPage.setRememberMe(true);
+    await loginPage.submit();
+
+    await expect(page).toHaveURL(/\/$/);
+
+    // Navigate back to login in the same browser context to verify persistence.
+    await page.goto('/login');
+    await loginPage.expectLoaded();
+
+    await expect(loginPage.emailInput).toHaveValue(validEmail);
+  });
+
+  test('shows an error for invalid credentials and remains on login', async ({ page }) => {
+    const loginPage = new LoginPage(page);
+
+    await loginPage.goto();
+    await loginPage.expectLoaded();
+
+    await loginPage.login({
+      email: `invalid-${Date.now()}@example.com`,
+      password: 'WrongPassword1!',
+    });
+
+    await expect(page).toHaveURL(/\/login$/);
+    await loginPage.expectErrorVisible();
+  });
+
+  test('redirects protected routes to login when unauthenticated', async ({ page }) => {
+    const loginPage = new LoginPage(page);
+
+    await page.goto(protectedRoute);
+
+    await expect(page).toHaveURL(/\/login$/);
+    await loginPage.expectLoaded();
+  });
+});
diff --git a/e2e/flow4-password-reset.spec.js b/e2e/flow4-password-reset.spec.js
new file mode 100644
index 0000000..5d005c4
--- /dev/null
+++ b/e2e/flow4-password-reset.spec.js
@@ -0,0 +1,112 @@
+import { test, expect } from '@playwright/test';
+import { createClient } from '@supabase/supabase-js';
+import { LoginPage } from './pages/Login';
+
+const supabase = createClient(
+  process.env.SUPABASE_URL,
+  process.env.SUPABASE_SERVICE_ROLE_KEY
+);
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+
+const resetEmail = process.env.E2E_RESET_EMAIL || `flow4-reset-${Date.now()}@example.com`;
+const initialPassword = process.env.E2E_RESET_INITIAL_PASSWORD || 'ResetPass1!';
+const newPassword = process.env.E2E_RESET_NEW_PASSWORD || 'ResetPass2!';
+
+test.use({ storageState: { cookies: [], origins: [] } });
+
+async function deleteUserByEmail(email) {
+  const { data } = await supabase.auth.admin.listUsers();
+  const user = data?.users?.find((entry) => entry.email === email);
+  if (user) {
+    await supabase.auth.admin.deleteUser(user.id);
+  }
+}
+
+async function createResetUser() {
+  await deleteUserByEmail(resetEmail);
+
+  const { data, error } = await supabase.auth.admin.createUser({
+    email: resetEmail,
+    password: initialPassword,
+    email_confirm: true,
+  });
+
+  if (error) {
+    throw error;
+  }
+
+  return data.user;
+}
+
+async function buildRecoveryLink(email) {
+  const { data, error } = await supabase.auth.admin.generateLink({
+    type: 'recovery',
+    email,
+    options: {
+      redirectTo: `${appUrl}/update-password`,
+    },
+  });
+
+  if (error) {
+    throw error;
+  }
+
+  return data?.properties?.action_link || data?.action_link || data?.properties?.actionLink;
+}
+
+test.describe('Flow #4: Password Reset and Update Password', () => {
+  let resetUser;
+
+  test.beforeAll(async () => {
+    resetUser = await createResetUser();
+  });
+
+  test.afterAll(async () => {
+    if (resetUser?.id) {
+      await supabase.auth.admin.deleteUser(resetUser.id);
+    } else {
+      await deleteUserByEmail(resetEmail);
+    }
+  });
+
+  test('submits a reset request, follows the recovery link, and updates the password', async ({ page }) => {
+    const loginPage = new LoginPage(page);
+    // authenticate user
+    await loginPage.goto();
+    await loginPage.login({ email: resetEmail, password: initialPassword });
+    await expect(resetUser).toBeTruthy();
+
+    await page.goto('/reset-password');
+    await expect(page.getByRole('heading', { name: /reset password/i })).toBeVisible();
+
+    await page.getByPlaceholder('Enter your email address').fill(resetEmail);
+    await expect(page.getByPlaceholder('Enter your email address')).toHaveValue(resetEmail);
+    await page.getByRole('button', { name: /send reset email/i }).click();
+    await expect(page.getByText(/check your email for a reset link/i)).toBeVisible();
+
+    const recoveryLink = await buildRecoveryLink(resetEmail);
+    if (!recoveryLink) {
+      throw new Error('Supabase did not return a recovery link for Flow 4.');
+    }
+
+    await page.goto(recoveryLink);
+    await expect(page).toHaveURL(/\/update-password/);
+    await expect(page.getByRole('heading', { name: /update password/i })).toBeVisible();
+
+    await page.getByPlaceholder('Enter new password').fill(newPassword);
+    await page.getByRole('button', { name: /update password/i }).click();
+
+    await expect(page).toHaveURL(/\/login$/);
+    await loginPage.expectLoaded();
+  });
+
+  test('shows password validation errors on the update form', async ({ page }) => {
+    await page.goto('/update-password');
+
+    await expect(page.getByRole('heading', { name: /update password/i })).toBeVisible();
+    await page.getByRole('button', { name: /update password/i }).click();
+
+    await expect(page.getByText(/password is required/i)).toBeVisible();
+  });
+});
\ No newline at end of file
diff --git a/e2e/flow5-6-profile.spec.js b/e2e/flow5-6-profile.spec.js
new file mode 100644
index 0000000..7b4b6b5
--- /dev/null
+++ b/e2e/flow5-6-profile.spec.js
@@ -0,0 +1,55 @@
+import { test, expect } from '@playwright/test';
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+const apiUrl = process.env.PLAYWRIGHT_API_URL || 'http://localhost:5000';
+const authFile = 'playwright/.auth/user.json';
+
+test.use({ storageState: authFile });
+
+async function getSupabaseAuthUid(page) {
+  return page.evaluate(() => {
+    const authKey = Object.keys(localStorage).find((key) => key.includes('auth-token'));
+    if (!authKey) return null;
+
+    try {
+      const rawValue = localStorage.getItem(authKey);
+      if (!rawValue) return null;
+
+      const parsed = JSON.parse(rawValue);
+      return parsed?.currentSession?.user?.id || parsed?.session?.user?.id || parsed?.user?.id || null;
+    } catch {
+      return null;
+    }
+  });
+}
+
+test('Flow #5: view own profile data', async ({ page }) => {
+  await page.goto('/account');
+
+  await expect(page.getByRole('heading', { name: /my profile/i })).toBeVisible();
+  await expect(page.getByRole('heading', { name: /personal information/i })).toBeVisible();
+  await expect(page.getByRole('heading', { name: /^address$/i })).toBeVisible();
+  await expect(page.getByText(/E2E Setup/i)).toBeVisible();
+  await expect(page.getByText(/Starkville, MS, USA/i)).toBeVisible();
+  await expect(page.getByText(/6625550101/i)).toBeVisible();
+});
+
+test('Flow #6: edit own profile and persist changes', async ({ page }) => {
+  await page.goto('/account');
+  await expect(page.getByRole('heading', { name: /my profile/i })).toBeVisible();
+
+  const authUid = await getSupabaseAuthUid(page);
+  expect(authUid).toBeTruthy();
+
+  const updateResponse = await page.request.put(`${apiUrl}/api/auth/profile`, {
+    data: {
+      auth_uid: authUid,
+      bio: 'Updated bio for flow 6',
+    },
+  });
+
+  expect(updateResponse.ok()).toBeTruthy();
+
+  await page.goto('/account');
+  await expect(page.getByText(/Updated bio for flow 6/i)).toBeVisible();
+});
\ No newline at end of file
diff --git a/e2e/flow9-family-directory.spec.js b/e2e/flow9-family-directory.spec.js
new file mode 100644
index 0000000..2c52ed4
--- /dev/null
+++ b/e2e/flow9-family-directory.spec.js
@@ -0,0 +1,47 @@
+import { test, expect } from '@playwright/test';
+import { deleteIfExists, getCurrentAccountId, seedManualFamilyMember } from './helpers/flowSeeds';
+
+const appUrl = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:3000';
+const apiUrl = process.env.PLAYWRIGHT_API_URL || 'http://localhost:5000';
+const authFile = 'playwright/.auth/user.json';
+
+const uniqueSuffix = Date.now();
+const manualMemberSeed = {
+  firstname: 'FlowNine',
+  lastname: `Member${uniqueSuffix}`,
+  birthdate: '1993-03-03',
+  deathdate: '',
+  location: 'Starkville',
+  phonenumber: '6625550103',
+  gender: 'M',
+};
+
+test.use({ storageState: authFile });
+
+let seededManualMember;
+
+test.beforeAll(async ({ browser }) => {
+  const currentAccountId = await getCurrentAccountId(browser, authFile, appUrl);
+  seededManualMember = await seedManualFamilyMember(apiUrl, currentAccountId, manualMemberSeed);
+});
+
+test.afterAll(async () => {
+  if (seededManualMember?.id) {
+    await deleteIfExists(`${apiUrl}/api/family-members/${seededManualMember.id}`);
+  }
+});
+
+test('Flow #9: view family directory and open member profile', async ({ page }) => {
+  await page.goto('/family');
+
+  await expect(page.getByRole('heading', { name: /member list/i })).toBeVisible();
+
+  await page.getByPlaceholder('Search for family members...').fill(manualMemberSeed.lastname);
+  await expect(page.getByText(`${manualMemberSeed.firstname} ${manualMemberSeed.lastname}`)).toBeVisible();
+
+  await page.getByRole('link', { name: /view/i }).click();
+
+  await expect(page).toHaveURL(new RegExp(`/account/${seededManualMember.id}$`));
+  await expect(page.getByRole('heading', { name: /profile/i })).toBeVisible();
+  await expect(page.getByRole('heading', { name: `${manualMemberSeed.firstname} ${manualMemberSeed.lastname}` })).toBeVisible();
+});
\ No newline at end of file
diff --git a/e2e/helpers/constants.js b/e2e/helpers/constants.js
new file mode 100644
index 0000000..007b442
--- /dev/null
+++ b/e2e/helpers/constants.js
@@ -0,0 +1,3 @@
+export const clientUrl = process.env.TEST_CLIENT_URL || 'http://localhost:3000';
+export const serverUrl = process.env.TEST_SERVER_URL || 'http://localhost:3000';
+export const authFile = process.env.TEST_AUTH_FILE || 'playwright/.auth/user.json';
\ No newline at end of file
diff --git a/e2e/helpers/flowSeeds.js b/e2e/helpers/flowSeeds.js
new file mode 100644
index 0000000..00442ac
--- /dev/null
+++ b/e2e/helpers/flowSeeds.js
@@ -0,0 +1,106 @@
+import { createClient } from '@supabase/supabase-js';
+
+const supabase = createClient(
+  process.env.SUPABASE_URL,
+  process.env.SUPABASE_SERVICE_ROLE_KEY
+);
+
+export async function getCurrentAccountId(browser, authFile, appUrl) {
+  const context = await browser.newContext({ storageState: authFile, baseURL: appUrl });
+  const page = await context.newPage();
+
+  await page.goto('/account');
+  await page.waitForURL(/\/account\/[^/]+$/);
+  const accountId = page.url().split('/').filter(Boolean).pop();
+
+  await context.close();
+
+  if (!accountId) {
+    throw new Error('Unable to resolve current account ID from authenticated storage state.');
+  }
+
+  return accountId;
+}
+
+export async function seedRegisteredUser(apiUrl, seed) {
+  const { data, error } = await supabase.auth.admin.createUser({
+    email: seed.email,
+    password: seed.password,
+    email_confirm: true,
+  });
+
+  if (error) {
+    throw error;
+  }
+
+  const response = await fetch(`${apiUrl}/api/auth/sync`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      auth_uid: data.user.id,
+      email: seed.email,
+      username: seed.email,
+      firstName: seed.firstname,
+      lastName: seed.lastname,
+      gender: seed.gender,
+      phoneNumber: seed.phonenum,
+      birthDate: seed.birthdate,
+      displayName: `${seed.firstname} ${seed.lastname}`,
+      address: seed.address,
+      city: seed.city,
+      state: seed.state,
+      country: seed.country,
+      zipcode: seed.zipcode,
+    }),
+  });
+
+  const syncData = await response.json();
+  if (!response.ok) {
+    throw new Error(syncData?.error || syncData?.details || 'Failed to seed registered user.');
+  }
+
+  return {
+    authUid: data.user.id,
+    dbUserId: syncData.id,
+    email: seed.email,
+    firstname: seed.firstname,
+    lastname: seed.lastname,
+  };
+}
+
+export async function seedManualFamilyMember(apiUrl, accountId, seed) {
+  const response = await fetch(`${apiUrl}/api/family-members/`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      firstname: seed.firstname,
+      lastname: seed.lastname,
+      birthdate: seed.birthdate,
+      deathdate: seed.deathdate,
+      location: seed.location,
+      phonenumber: seed.phonenumber,
+      userid: accountId,
+      memberuserid: null,
+      gender: seed.gender,
+    }),
+  });
+
+  const responseData = await response.json();
+  if (!response.ok) {
+    throw new Error(responseData?.error || responseData?.details || 'Failed to seed manual family member.');
+  }
+
+  return responseData.member || responseData;
+}
+
+export async function deleteIfExists(url, options = {}) {
+  try {
+    await fetch(url, {
+      method: 'DELETE',
+      headers: { 'Content-Type': 'application/json' },
+      ...options,
+    });
+  } catch (error) {
+    console.warn('Cleanup request failed:', error.message);
+  }
+}
\ No newline at end of file
diff --git a/e2e/pages/CreateAccount.js b/e2e/pages/CreateAccount.js
new file mode 100644
index 0000000..1084c8a
--- /dev/null
+++ b/e2e/pages/CreateAccount.js
@@ -0,0 +1,89 @@
+import { expect, locator } from '@playwright/test';
+
+export class CreateAccountPage {
+	constructor(page) {
+		this.page = page;
+
+		this.title = page.getByRole('heading', { name: /create account/i });
+		this.form = page.locator('form');
+		this.errorMessage = page.getByText(/registration failed|error/i).first();
+
+		this.firstNameInput = page.locator('#firstname');
+		this.lastNameInput = page.locator('#lastname');
+		this.birthdateInput = page.locator('#birthdate');
+		this.genderSelect = page.locator('#gender');
+		this.emailInput = page.locator('#email');
+		this.addressInput = page.locator('#address');
+		this.cityInput = page.locator('#city');
+		this.stateInput = page.locator('#state');
+		this.countryInput = page.locator('#country');
+		this.zipcodeInput = page.locator('#zipcode');
+		this.phoneInput = page.locator('#phonenum');
+		this.passwordInput = page.locator('#password');
+
+		this.createAccountButton = page.getByRole('button', { name: /create account/i });
+		this.loginLink = page.getByRole('link', { name: /login here/i });
+	}
+
+	async goto() {
+		await this.page.goto('/register');
+	}
+
+	async expectLoaded() {
+		await expect(this.title).toBeVisible();
+		await expect(this.form).toBeVisible();
+		await expect(this.firstNameInput).toBeVisible();
+		await expect(this.createAccountButton).toBeVisible();
+	}
+
+	async fillRequiredFields({
+		firstname,
+		lastname,
+		birthdate,
+		gender,
+		email,
+		country,
+		password,
+	}) {
+		await this.firstNameInput.fill(firstname);
+		await this.lastNameInput.fill(lastname);
+		await this.birthdateInput.fill(birthdate);
+		await this.genderSelect.selectOption(gender);
+		await this.emailInput.fill(email);
+		await this.countryInput.fill(country);
+		await this.passwordInput.fill(password);
+	}
+
+	async fillOptionalFields({
+		address,
+		city,
+		state,
+		zipcode,
+		phonenum,
+	} = {}) {
+		if (address !== undefined) {
+			await this.addressInput.fill(address);
+		}
+		if (city !== undefined) {
+			await this.cityInput.fill(city);
+		}
+		if (state !== undefined) {
+			await this.stateInput.fill(state);
+		}
+		if (zipcode !== undefined) {
+			await this.zipcodeInput.fill(zipcode);
+		}
+		if (phonenum !== undefined) {
+			await this.phoneInput.fill(phonenum);
+		}
+	}
+
+	async fillForm(data) {
+		await this.fillRequiredFields(data);
+		await this.fillOptionalFields(data);
+	}
+
+	async submit() {
+		await this.createAccountButton.click();
+	}
+}
diff --git a/e2e/pages/Login.js b/e2e/pages/Login.js
new file mode 100644
index 0000000..829571a
--- /dev/null
+++ b/e2e/pages/Login.js
@@ -0,0 +1,96 @@
+import { expect } from '@playwright/test';
+
+export class LoginPage {
+	constructor(page) {
+		this.page = page;
+
+		this.heading = page.getByRole('heading', { name: /welcome back to kintree/i });
+		this.subtitle = page.getByText(/enter your email and password to continue/i);
+
+		this.emailInput = page.getByPlaceholder('Enter your email address');
+		this.passwordInput = page.getByPlaceholder('Enter your password');
+		this.signInButton = page.getByRole('button', { name: /^sign in$/i });
+
+		this.rememberMeCheckbox = page.getByRole('checkbox', { name: /remember me/i });
+		this.forgotPasswordLink = page.getByRole('link', { name: /forgot password/i });
+		this.registerLink = page.getByRole('link', { name: /register/i });
+		this.googleButton = page.getByRole('button', { name: /google/i });
+
+		this.inlineError = page.locator('p').filter({ hasText: /invalid|error|failed|required/i }).first();
+
+		this.mfaPrompt = page.getByText(/enter the 6-digit code from your authenticator app/i);
+		this.mfaCodeInput = page.getByPlaceholder('123456');
+		this.verifyButton = page.getByRole('button', { name: /^verify$/i });
+	}
+
+	async goto() {
+		await this.page.goto('/login');
+	}
+
+	async expectLoaded() {
+		await expect(this.heading).toBeVisible();
+		await expect(this.emailInput).toBeVisible();
+		await expect(this.passwordInput).toBeVisible();
+		await expect(this.signInButton).toBeVisible();
+	}
+
+	async fillEmail(email) {
+		await this.emailInput.fill(email);
+	}
+
+	async fillPassword(password) {
+		await this.passwordInput.fill(password);
+	}
+
+	async fillCredentials({ email, password }) {
+		if (email !== undefined) {
+			await this.fillEmail(email);
+		}
+		if (password !== undefined) {
+			await this.fillPassword(password);
+		}
+	}
+
+	async submit() {
+		await this.signInButton.click();
+	}
+
+	async login({ email, password }) {
+		await this.fillCredentials({ email, password });
+		await this.submit();
+	}
+
+	async setRememberMe(checked) {
+		const isChecked = await this.rememberMeCheckbox.isChecked();
+		if (isChecked !== checked) {
+			await this.rememberMeCheckbox.click();
+		}
+	}
+
+	async clickForgotPassword() {
+		await this.forgotPasswordLink.click();
+	}
+
+	async clickRegister() {
+		await this.registerLink.click();
+	}
+
+	async signInWithGoogle() {
+		await this.googleButton.click();
+	}
+
+	async expectMfaStepVisible() {
+		await expect(this.mfaPrompt).toBeVisible();
+		await expect(this.mfaCodeInput).toBeVisible();
+		await expect(this.verifyButton).toBeVisible();
+	}
+
+	async submitMfaCode(code) {
+		await this.mfaCodeInput.fill(code);
+		await this.verifyButton.click();
+	}
+
+	async expectErrorVisible() {
+		await expect(this.inlineError).toBeVisible();
+	}
+}
diff --git a/e2e/smoke.spec.js b/e2e/smoke.spec.js
new file mode 100644
index 0000000..b721fdb
--- /dev/null
+++ b/e2e/smoke.spec.js
@@ -0,0 +1,19 @@
+import { test, expect } from '@playwright/test';
+
+test.describe('Client/Server Smoke Tests', () => {
+  
+  test('React frontend is running and accessible', async ({ page }) => {
+    // Navigates to http://localhost:3000/ 
+    await page.goto('/');
+    
+    await expect(page).toHaveTitle(/KinTree/i); 
+  });
+
+  test('Express backend API is reachable', async ({ request }) => {
+    // Ping the backend directly on port 5000 to ensure the Express server is up
+    const response = await request.get('http://localhost:5000/');
+    
+    expect(response.ok()).toBeTruthy(); 
+  });
+
+});
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9c6c515..4b26845 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,6 +8,7 @@
       "name": "client",
       "version": "0.1.0",
       "dependencies": {
+        "@supabase/supabase-js": "^2.102.1",
         "@testing-library/jest-dom": "^5.17.0",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^13.5.0",
@@ -20,7 +21,10 @@
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+        "@playwright/test": "^1.59.1",
+        "@types/node": "^25.5.0",
+        "dotenv": "^17.4.1"
       }
     },
     "node_modules/@adobe/css-tools": {
@@ -3480,6 +3484,21 @@
         "node": ">=14"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.59.1.tgz",
+      "integrity": "sha512-PG6q63nQg5c9rIi4/Z5lR5IVF7yU5MqmKaPOe0HSc0O2cX1fPi96sUQu5j7eo4gKCkB2AnNGoWt7y4/Xx3Kcqg==",
+      "dev": true,
+      "dependencies": {
+        "playwright": "1.59.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@pmmmwh/react-refresh-webpack-plugin": {
       "version": "0.5.15",
       "resolved": "https://registry.npmjs.org/@pmmmwh/react-refresh-webpack-plugin/-/react-refresh-webpack-plugin-0.5.15.tgz",
@@ -3643,6 +3662,105 @@
         "@sinonjs/commons": "^1.7.0"
       }
     },
+    "node_modules/@supabase/auth-js": {
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/@supabase/auth-js/-/auth-js-2.102.1.tgz",
+      "integrity": "sha512-2uH2WB0H98TOGDtaFWhxIcR42Dro/VB7VDZanz/4bVJsqioIue1m3TUqu3xciDm2W9r+1LXQvYNsYbQfWmD+uQ==",
+      "dependencies": {
+        "tslib": "2.8.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@supabase/functions-js": {
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/@supabase/functions-js/-/functions-js-2.102.1.tgz",
+      "integrity": "sha512-UcrcKTPnAIo+Yp9Jjq9XXwFbsmgRYY637mwka9ZjmTIWcX/xr1pote4OVvaGQycVY1KTiQgjMvpC0Q0yJhRq3w==",
+      "dependencies": {
+        "tslib": "2.8.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@supabase/phoenix": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@supabase/phoenix/-/phoenix-0.4.0.tgz",
+      "integrity": "sha512-RHSx8bHS02xwfHdAbX5Lpbo6PXbgyf7lTaXTlwtFDPwOIw64NnVRwFAXGojHhjtVYI+PEPNSWwkL90f4agN3bw=="
+    },
+    "node_modules/@supabase/postgrest-js": {
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/@supabase/postgrest-js/-/postgrest-js-2.102.1.tgz",
+      "integrity": "sha512-InLvXKAYf8BIqiv9jWOYudWB3rU8A9uMbcip5BQ5sLLNPrbO1Ekkr79OvlhZBgMNSppxVyC7wPPGzLxMcTZhlA==",
+      "dependencies": {
+        "tslib": "2.8.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@supabase/realtime-js": {
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/@supabase/realtime-js/-/realtime-js-2.102.1.tgz",
+      "integrity": "sha512-h2fCumib/v6u7XMwSPgxnpfimjX4xCEayUHrxWLC7UurfQjUZJ0pmJDgm6yj80DnUerxuulRghwm5zXYysFG/Q==",
+      "dependencies": {
+        "@supabase/phoenix": "^0.4.0",
+        "@types/ws": "^8.18.1",
+        "tslib": "2.8.1",
+        "ws": "^8.18.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@supabase/realtime-js/node_modules/ws": {
+      "version": "8.20.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.20.0.tgz",
+      "integrity": "sha512-sAt8BhgNbzCtgGbt2OxmpuryO63ZoDk/sqaB/znQm94T4fCEsy/yV+7CdC1kJhOU9lboAEU7R3kquuycDoibVA==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@supabase/storage-js": {
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/@supabase/storage-js/-/storage-js-2.102.1.tgz",
+      "integrity": "sha512-eCL9T4Xpe40nmKlkUJ7Zq/hk34db1xPiT0WL3Iv5MbJqHuCAe5TxhV8Rjqd6DNZrzjtfYObZtYl9jKJaHrivqw==",
+      "dependencies": {
+        "iceberg-js": "^0.8.1",
+        "tslib": "2.8.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@supabase/supabase-js": {
+      "version": "2.102.1",
+      "resolved": "https://registry.npmjs.org/@supabase/supabase-js/-/supabase-js-2.102.1.tgz",
+      "integrity": "sha512-bChxPVeLDnYN9M2d/u4fXsvylwSQG5grAl+HN8f+ZD9a9PuVU+Ru+xGmEsk+b9Iz3rJC9ZQnQUJYQ28fApdWYA==",
+      "dependencies": {
+        "@supabase/auth-js": "2.102.1",
+        "@supabase/functions-js": "2.102.1",
+        "@supabase/postgrest-js": "2.102.1",
+        "@supabase/realtime-js": "2.102.1",
+        "@supabase/storage-js": "2.102.1"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/@surma/rollup-plugin-off-main-thread": {
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-2.2.3.tgz",
@@ -4695,12 +4813,11 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.7.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.7.5.tgz",
-      "integrity": "sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==",
-      "license": "MIT",
+      "version": "25.5.0",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-25.5.0.tgz",
+      "integrity": "sha512-jp2P3tQMSxWugkCUKLRPVUpGaL5MVFwF8RDuSRztfwgN1wmqJeMSbKlnEtQqU8UrhTmzEmZdu2I6v2dpp7XIxw==",
       "dependencies": {
-        "undici-types": "~6.19.2"
+        "undici-types": "~7.18.0"
       }
     },
     "node_modules/@types/node-forge": {
@@ -4849,10 +4966,9 @@
       "license": "MIT"
     },
     "node_modules/@types/ws": {
-      "version": "8.5.14",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.14.tgz",
-      "integrity": "sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==",
-      "license": "MIT",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
       "dependencies": {
         "@types/node": "*"
       }
@@ -7755,12 +7871,15 @@
       }
     },
     "node_modules/dotenv": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
-      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
-      "license": "BSD-2-Clause",
+      "version": "17.4.1",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.1.tgz",
+      "integrity": "sha512-k8DaKGP6r1G30Lx8V4+pCsLzKr8vLmV2paqEj1Y55GdAgJuIqpRp5FfajGF8KtwMxCz9qJc6wUIJnm053d/WCw==",
+      "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
       }
     },
     "node_modules/dotenv-expand": {
@@ -10274,6 +10393,14 @@
         "node": ">=10.17.0"
       }
     },
+    "node_modules/iceberg-js": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/iceberg-js/-/iceberg-js-0.8.1.tgz",
+      "integrity": "sha512-1dhVQZXhcHje7798IVM+xoo/1ZdVfzOMIc8/rgVSijRK38EDqOJoGula9N/8ZI5RD8QTxNQtK/Gozpr+qUqRRA==",
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/iconv-lite": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
@@ -14707,6 +14834,50 @@
         "node": ">=4"
       }
     },
+    "node_modules/playwright": {
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.59.1.tgz",
+      "integrity": "sha512-C8oWjPR3F81yljW9o5OxcWzfh6avkVwDD2VYdwIGqTkl+OGFISgypqzfu7dOe4QNLL2aqcWBmI3PMtLIK233lw==",
+      "dev": true,
+      "dependencies": {
+        "playwright-core": "1.59.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.59.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.59.1.tgz",
+      "integrity": "sha512-HBV/RJg81z5BiiZ9yPzIiClYV/QMsDCKUyogwH9p3MCP6IYjUFu/MActgYAvK0oWyV9NlwM3GLBjADyWgydVyg==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -16660,6 +16831,14 @@
         }
       }
     },
+    "node_modules/react-scripts/node_modules/dotenv": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/read-cache": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -19021,17 +19200,16 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
-      "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
-      "license": "Apache-2.0",
+      "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
       },
       "engines": {
-        "node": ">=14.17"
+        "node": ">=4.2.0"
       }
     },
     "node_modules/unbox-primitive": {
@@ -19059,10 +19237,9 @@
       "license": "MIT"
     },
     "node_modules/undici-types": {
-      "version": "6.19.8",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
-      "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
-      "license": "MIT"
+      "version": "7.18.2",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
+      "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.1",
diff --git a/package.json b/package.json
index 286c8ac..b9bb03f 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@supabase/supabase-js": "^2.102.1",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -17,7 +18,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test",
+    "test": "npx playwright test",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {
@@ -39,6 +40,9 @@
     ]
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "@playwright/test": "^1.59.1",
+    "@types/node": "^25.5.0",
+    "dotenv": "^17.4.1"
   }
 }
diff --git a/playwright.config.ts b/playwright.config.ts
new file mode 100644
index 0000000..0f50c9f
--- /dev/null
+++ b/playwright.config.ts
@@ -0,0 +1,38 @@
+import { defineConfig, devices } from '@playwright/test';
+import dotenv from 'dotenv';
+import path from 'path';
+
+dotenv.config({ path: path.resolve(__dirname, '.env.test') });
+
+export default defineConfig({
+  testDir: './e2e',
+  fullyParallel: true,
+  // Fail the build on CI if you accidentally left test.only in the code
+  forbidOnly: !!process.env.CI,
+  // Retry failing tests twice on CI to handle random network flakes
+  retries: process.env.CI ? 2 : 0,
+  workers: process.env.CI ? 1 : undefined,
+  reporter: 'html',
+  
+  use: {
+    baseURL: 'http://localhost:3000', 
+    trace: 'on-first-retry',
+  },
+
+  projects: [
+    // setup project for auth state
+    { 
+      name: 'setup', 
+      testMatch: /.*\.setup\.ts/ 
+    },
+    // chromium project to run tests after setup
+    {   
+      name: 'chromium',
+      use: { 
+        ...devices['Desktop Chrome'],
+        storageState: 'playwright/.auth/user.json',
+      },
+      dependencies: ['setup'], 
+    },
+  ],
+});
\ No newline at end of file
diff --git a/server/.gitignore b/server/.gitignore
index 129edbc..d7c4df6 100644
--- a/server/.gitignore
+++ b/server/.gitignore
@@ -16,8 +16,10 @@
 .env.local
 .env.development.local
 .env.test.local
+playwright/.auth
 .env.production.local
 .env
+.env.test
 client/project-root/.env
 server/.env
 npm-debug.log*
diff --git a/server/package-lock.json b/server/package-lock.json
index 8dfe116..a5ef855 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -22,7 +22,8 @@
         "resend": "^6.9.3"
       },
       "devDependencies": {
-        "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+        "cross-env": "^10.1.0"
       }
     },
     "node_modules/@ampproject/remapping": {
@@ -512,6 +513,12 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@epic-web/invariant": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@epic-web/invariant/-/invariant-1.0.0.tgz",
+      "integrity": "sha512-lrTPqgvfFQtR/eY/qkIzp98OGdNJu0m5ji3q/nJI8v3SXkRKEnWiOxMmbvcSoAIzv/cGiuvRy57k4suKQSAdwA==",
+      "dev": true
+    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.8",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
@@ -1010,6 +1017,37 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/cross-env": {
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-10.1.0.tgz",
+      "integrity": "sha512-GsYosgnACZTADcmEyJctkJIoqAhHjttw7RsFrVoJNXbsWWqaq6Ym+7kZjq6mS45O0jij6vtiReppKQEtqWy6Dw==",
+      "dev": true,
+      "dependencies": {
+        "@epic-web/invariant": "^1.0.0",
+        "cross-spawn": "^7.0.6"
+      },
+      "bin": {
+        "cross-env": "dist/bin/cross-env.js",
+        "cross-env-shell": "dist/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -1551,6 +1589,12 @@
       "integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
       "license": "MIT"
     },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2050,6 +2094,15 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -2359,6 +2412,27 @@
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "license": "ISC"
     },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/side-channel": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
@@ -2647,6 +2721,21 @@
         "webidl-conversions": "^3.0.0"
       }
     },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "dev": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/ws": {
       "version": "8.18.3",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz",
diff --git a/server/package.json b/server/package.json
index d3f718d..2ba7798 100644
--- a/server/package.json
+++ b/server/package.json
@@ -5,7 +5,9 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "node server.js"
+    "start": "node server.js",
+    "start:dev-test": "node --env-file=.env.test server.js",
+    "start:ci-test": "cross-env NODE_ENV=test node server.js"
   },
   "keywords": [],
   "author": "",
@@ -24,6 +26,7 @@
     "resend": "^6.9.3"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11"
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
+    "cross-env": "^10.1.0"
   }
 }
diff --git a/server/server.js b/server/server.js
index 7f6ff50..c13a831 100644
--- a/server/server.js
+++ b/server/server.js
@@ -12,12 +12,23 @@ const treeInfoRoutes = require('./routes/treeInfoRoutes');
 const eventRoutes = require('./routes/eventRoutes');
 const memoryRoutes = require('./routes/memoryRoutes');
 
+if (process.env.NODE_ENV === 'test') {
+  dotenv.config({ path: '.env.test' });
+} else {
+  dotenv.config(); 
+}
+
 const app = express();
 const port = process.env.PORT || 5000;
 
 app.use(express.json());
 app.use(cors());
 
+// Status check  
+app.get('/', (req, res) => {
+  res.status(200).json();
+});
+
 app.use('/api/share-trees', sharedTreeRoutes)
 app.use('/api/family-members', treeMemberRoutes);
 app.use('/api/relationships', relationshipRoutes);