diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..2a70607
Binary files /dev/null and b/.DS_Store differ
diff --git a/compass/app/auth/forgot_password/page.tsx b/compass/app/auth/forgot_password/page.tsx
index 9b0e37e..05323ee 100644
--- a/compass/app/auth/forgot_password/page.tsx
+++ b/compass/app/auth/forgot_password/page.tsx
@@ -6,14 +6,18 @@ import Paper from '@/components/auth/Paper';
 import { useState, useEffect } from 'react';
 
 function isValidEmail(email: string) {
+    //check email validation
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
 
     if (email.trim() === '') {
+        //check if input is empty
         return 'Email cannot be empty';
     } else if (!emailRegex.test(email)) {
+        //check for incorrect email format
         return 'Invalid email format';
     }
     else{
+        //return message for no error in input
         return 'If your email exists in the database, you should receive a password reset in your inbox.'
     }
 
@@ -25,8 +29,10 @@ export default function Page()  {
     const [emailError, setEmailError] = useState('');
 
     useEffect(() => {
+        //when email string inputted it is checked in isValidEmail
         const error = isValidEmail(confirmEmail);
         setEmailError(error);
+        //button is disabled if any error is detected
         setIsButtonDisabled(error !== null && !error.includes('exists in the database'));
     }, [confirmEmail]);
 
@@ -40,6 +46,7 @@ export default function Page()  {
                         <Input type='email'
                         title="Enter your email address"
                         placeholder="janedoe@gmail.com"
+                        //setting a placeholder in the email input box
                         value={confirmEmail}
                         icon={'EmailInputIcon'}
                         onChange={(e) => {
@@ -49,10 +56,11 @@ export default function Page()  {
                         <p className={`mt-2 ${emailError.includes('exists in the database') ? 'text-green-500' : 'text-red-500'}`}>
                             {emailError}
                             </p>
+                            //if email does not meet certain criteria, then issue an error
                             )}
                     </div>
                     <div className="flex flex-col items-left space-y-4">
-                        <InlineLink href="/login">
+                        <InlineLink href= "/auth/login"> {/* link back to login page */}
                             Back to Sign In
                         </InlineLink>
                         <Button type="submit" disabled={isButtonDisabled}>
diff --git a/compass/app/page.tsx b/compass/app/page.tsx
new file mode 100644
index 0000000..ee3a07a
--- /dev/null
+++ b/compass/app/page.tsx
@@ -0,0 +1,86 @@
+// pages/index.tsx
+"use client";
+
+import Button from '@/components/Button';
+import Input from '@/components/Input'
+import InlineLink from '@/components/InlineLink';
+import Paper from '@/components/auth/Paper';
+// import { Metadata } from 'next'
+import Image from 'next/image';
+import {ChangeEvent, useState} from "react";
+
+// export const metadata: Metadata = {
+//   title: 'Login',
+// }
+
+export default function Page()  {
+    const [email, setEmail] = useState("");
+    const [password, setPassword] = useState("");
+    const [error, setError] = useState("");
+
+    const handleEmailChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        setEmail(event.currentTarget.value);
+        console.log("email " + email);
+    }
+
+    const handlePasswordChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+        setPassword(event.currentTarget.value);
+        console.log("password " + password)
+    }
+
+    const handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+        event.preventDefault();
+        // Priority: Incorrect combo > Missing email > Missing password
+
+        if (password.trim().length === 0) {
+            setError("Please enter your password.")
+        }
+        // This shouldn't happen, <input type="email"> already provides validation, but just in case.
+        if (email.trim().length === 0) {
+            setError("Please enter your email.")
+        }
+        // Placeholder for incorrect email + password combo.
+        if (email === "incorrect@gmail.com" && password) {
+            setError("Incorrect password.")
+        }
+    }
+
+
+
+    return (
+        <>
+            <Paper>
+                <form className="mb-0 m-auto mt-6 space-y-4 rounded-lg p-4 shadow-lg sm:p-6 lg:p-8 bg-white max-w-xl">
+                    <Image
+                        src="/logo.png"
+                        alt='Compass Center logo.'
+                        width={100}
+                        height={91}
+                    />
+                    <h1 className='font-bold text-xl text-purple-800'>Login</h1>
+                    <div className="mb-4">
+                        <Input type='email' title="Email" placeholder="janedoe@gmail.com" icon={'EmailInputIcon'} onChange={handleEmailChange} />
+                    </div>
+                    <div className="mb-6">
+                        <Input type='password' title="Password" onChange={handlePasswordChange} />
+                    </div>
+                    <div className="flex flex-col items-left space-y-4">
+                        <InlineLink href="/forgot_password">
+                            Forgot password?
+                        </InlineLink>
+                        <Button onClick={handleClick}>
+                            Login
+                        </Button>
+                        <div className="text-center text-red-600" hidden={!error}>
+                            <p>{error}</p>
+                        </div>
+
+                    </div>
+                </form>
+                <p className="text-center mt-6 text-gray-500 text-xs">
+                    &copy; 2024 Compass Center
+                </p>
+            </Paper>
+        </>
+    );
+};
\ No newline at end of file