diff --git a/src/Firebase.js b/src/Firebase.js
index 0f46104..71cab35 100644
--- a/src/Firebase.js
+++ b/src/Firebase.js
@@ -41,7 +41,11 @@ async function loginWithGoogle() {
                         "uid": uid_str,
                         "coins": 0,
                         "rooms": ["Gray"],
-                        "decorations": []
+                        "decorations": [],
+                        "lastLogin": Date.now(),
+                        // "friends": [],
+                        // "requests": [],
+                        // "email": ""
                     });
                 }
                 catch (e) {
@@ -60,7 +64,15 @@ async function loginWithGoogle() {
                             // @ts-ignore
                             rooms: doc.data().rooms,
                             // @ts-ignore
-                            decorations: doc.data().decorations
+                            decorations: doc.data().decorations,
+                            // @ts-ignore
+                            lastLogin: doc.data().lastLogin,
+                            // // @ts-ignore
+                            // friends: doc.data().friends,
+                            // // @ts-ignore
+                            // requests: doc.data().requests,
+                            // // @ts-ignore
+                            // email: doc.data().email
                         });
                     }
                 }
@@ -117,7 +129,11 @@ async function addActivity(activity, date, length) {
             "uid": get(UserInfoStore).uid,
             "coins": get(UserInfoStore).coins + Math.round(length/1000),
             "rooms":  get(UserInfoStore).rooms,
-            "decorations": get(UserInfoStore).decorations
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
         });
     }
     catch (e) {
@@ -160,18 +176,181 @@ async function buyRoom(room, price) {
             "uid": get(UserInfoStore).uid,
             "coins": get(UserInfoStore).coins - price,
             "rooms": rooms,
-            "decorations": get(UserInfoStore).decorations
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+            
         });
     }
     catch (e) {
         console.log(e);
     }
 }
+/**
+ * @param {string} decoration
+ * @param {number} price
+ */
+async function buyDecoration(decoration, price) {
+    try {
+        let decorations = get(UserInfoStore).rooms;
+        decorations.push(decoration);
+        await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), {
+            "uid": get(UserInfoStore).uid,
+            "coins": get(UserInfoStore).coins - price,
+            "rooms": get(UserInfoStore).rooms,
+            "decorations": decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+        });
+    }
+    catch (e) {
+        console.log(e);
+    }
+}
+
+/**
+ * 
+ * @param {number} newTime 
+ */
+async function addLastLogin(newTime){
+    try{
+        await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), {
+            "uid": get(UserInfoStore).uid,
+            "coins": get(UserInfoStore).coins,
+            "rooms":  get(UserInfoStore).rooms,
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": newTime,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+        });
+    }
+    catch (e){
+        console.log(e);
+    }
+}
+/*
+Friend list func
+
+Add (accept)
+Delete
+Decline
+Send
+
+*/
+
+/**
+ * 
+ * @param {any} aFriend
+ */
+async function addFriend(aFriend){
+    try{
+        // friends.push(aFriend);
+        // requests.remove(aFriend);
+        await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), {
+            "uid": get(UserInfoStore).uid,
+            "coins": get(UserInfoStore).coins,
+            "rooms":  get(UserInfoStore).rooms,
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+        });
+
+
+        // Add friends on the sender side
+    }
+    catch (e){
+        console.log(e);
+    }
+}
+
+/**
+ * 
+ * @param {any} delFriend
+ */
+async function deleteFriend(delFriend){
+    try{
+        // friends.remove(delFriend);
+        await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), {
+            "uid": get(UserInfoStore).uid,
+            "coins": get(UserInfoStore).coins,
+            "rooms":  get(UserInfoStore).rooms,
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+        });
+
+        // Remove friends on the receiver side
+    }
+    catch (e){
+        console.log(e);
+    }
+}
+
+/**
+ * 
+ * @param {any} declFriend
+ */
+async function declineFriend(declFriend){
+    try{
+        // requests.remove(declFriend);
+        await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), {
+            "uid": get(UserInfoStore).uid,
+            "coins": get(UserInfoStore).coins,
+            "rooms":  get(UserInfoStore).rooms,
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+        });
+
+        // Remove friends on the receiver side
+    }
+    catch (e){
+        console.log(e);
+    }
+}
+
+/**
+ * 
+ * @param {any} reqFriend
+ */
+async function sendFriendRequest(reqFriend){
+    try{
+        //On the receiver
 
+        // requests.push(reqFriend);
+        await updateDoc(doc(db, "userInfo", get(UserInfoStore).uid), {
+            "uid": get(UserInfoStore).uid,
+            "coins": get(UserInfoStore).coins,
+            "rooms":  get(UserInfoStore).rooms,
+            "decorations": get(UserInfoStore).decorations,
+            "lastLogin": get(UserInfoStore).lastLogin,
+            // "friends": get(UserInfoStore).friends,
+            // "requests": get(UserInfoStore).requests,
+            // "email": get(UserInfoStore).email
+        });
+
+    }
+    catch (e){
+        console.log(e);
+    }
+}
 export {
     loginWithGoogle,
     logoutFromGoogle,
     addActivity,
     getActivities,
-    buyRoom
+    buyRoom,
+    buyDecoration,
+    addLastLogin
 }
\ No newline at end of file
diff --git a/src/UserInfoStore.ts b/src/UserInfoStore.ts
index 48b95d0..d3b5a4c 100644
--- a/src/UserInfoStore.ts
+++ b/src/UserInfoStore.ts
@@ -4,12 +4,21 @@ const UserInfoStore = writable<{
     uid: string,
     coins: number,
     rooms: [string],
-    decorations: [string]
+    decorations: [string],
+    lastLogin: number,
+    // friends: [string],
+    // requests: [string],
+    // email: string
 }>({
     uid: "",
     coins: 0,
     rooms: [""],
-    decorations: [""]
+    decorations: [""],
+    lastLogin: -1
+    // Date.now()
+    // friends: [""],
+    // requests: [""],
+    // email: ""
 });
 
 export default {
diff --git a/src/routes/Homepage.svelte b/src/routes/Homepage.svelte
index af35cd7..1840371 100644
--- a/src/routes/Homepage.svelte
+++ b/src/routes/Homepage.svelte
@@ -12,10 +12,35 @@
 	 */
     let currentRoom;
 
+    /**
+	 * @type {boolean}
+	 */
+    let visible = true;
+
     onMount(() => {
-        currentRoom = "Gray";
+        currentRoom = "Gray";    
+
+        let newLogin = Date.now();
+        let newLoginDate = new Date(newLogin).getDate();
+            // newLogin = newLogin.getDate();
+            // console.log($UserInfoStore.lastLogin.toString());
+        let lastLoginDate = new Date ($UserInfoStore.lastLogin).getDate();
+
+        console.log("newLogin homepage1", newLogin);
+        console.log("newLogin homepage2", newLoginDate);
+        console.log("lastLogin homepage1", lastLoginDate);
+        console.log("lastLogin homepage2", $UserInfoStore.lastLogin);
     });
 
+    const dailyRewardModal = () =>{
+        SessionStore.set({
+            inSession: false,
+            sessionLength: 0,
+            modalType: "dailyReward",
+            counter: $SessionStore.counter+1,
+            sessionActivity: ""
+        });
+    }
     const startSessionModal = () => {
         SessionStore.set({
             inSession: false,
@@ -46,6 +71,16 @@
         });
     };
 
+    const storeModal = () => {
+        SessionStore.set({
+            inSession: false,
+            sessionLength: 0,
+            modalType: "store",
+            counter: $SessionStore.counter+1,
+            sessionActivity: ""
+        });
+    };
+
     const logout = () => {
         SessionStore.set({
             inSession: false,
@@ -78,6 +113,25 @@
             }
         }
     }
+
+    let newLogin = Date.now();
+    let newLoginDate = new Date(newLogin).getDate();
+
+    setInterval(() => {
+        let lastLogin = $UserInfoStore.lastLogin;
+        if (lastLogin != -1) {
+            let lastLoginDate = new Date ($UserInfoStore.lastLogin).getDate();
+            if (newLoginDate == lastLoginDate) {
+                console.log("ASGYUASGJ");
+                visible = false;
+            }
+        }
+    }, 100)
+
+    const clicked = () => {
+
+        visible = false
+    }
 </script>
 
 <style>
@@ -132,6 +186,11 @@
         align-items: center;
         justify-content: center;
     }
+    .top-top-bar {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
     .coin-bar{
         display: flex;
         align-items: center;
@@ -166,10 +225,34 @@
         padding-left: 3rem;
         font-size: 2rem;
     }
+
+    .showButton{
+        background-color: #F8DEC7;
+        border: none;
+    }
+    .innerShowButton{
+        display: block;
+        margin: auto;
+        background-color: #DC83A4;
+        border: none;
+        font-family: "Porpora-Regular";
+        font-size: 1rem;
+        padding: 1rem;
+        border-radius: 1.5rem;
+        color: white;
+        cursor: pointer;
+
+    }
 </style>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
-<img src="logout.png" alt="logout" class="logout_button" on:click={logout}>
+<div class="top-top-bar">
+    {#if visible}
+        <button on:click={clicked} class="showButton"> <button on:click={dailyRewardModal} class="innerShowButton">Daily Reward</button></button>
+    {/if}
+    <img src="logout.png" alt="logout" class="logout_button" on:click={logout}>
+</div>
+
 {#if $SessionStore.inSession}
     <InSession/>
 {:else}
@@ -193,17 +276,21 @@
             {:else if currentRoom == "Gray"}
                 <img src="Gray.png" alt="isometric" class="isometric"> 
             {/if}
+            <div class="coin-bar">
+                <img src="coin-icon.png" alt="coin-icon" class="coin-icon"> 
+                <div class="coin-value">{ $UserInfoStore.coins }</div>
+            </div>
         </div>
+
         <div class="right-side">
 
             
-            <button class="button" on:click={customizationModal}>Customize Study House</button>
+            <button class="button" on:click={customizationModal}>Inventory</button>
+            <br>
+            <button class="button" on:click={storeModal}>Store</button>
         </div>
     </div>
-            <div class="coin-bar">
-                <img src="coin-icon.png" alt="coin-icon" class="coin-icon"> 
-                <div class="coin-value">{ $UserInfoStore.coins }</div>
-            </div>
+            
     
 {/if}
 <ModalManager/>
diff --git a/src/routes/ModalManager.svelte b/src/routes/ModalManager.svelte
index 84a7632..881ee3b 100644
--- a/src/routes/ModalManager.svelte
+++ b/src/routes/ModalManager.svelte
@@ -4,8 +4,10 @@
     import FinishedSessionModal from './components/FinishedSessionModal.svelte';
     import ActivitiesModal from './components/ActivitiesModal.svelte';
     import CustomizationModal from './components/CustomizationModal.svelte';
+    import StoreModal from './components/StoreModal.svelte';
     import { writable } from 'svelte/store';
     import Modal from 'svelte-simple-modal';
+    import DailyReward from './components/DailyReward.svelte';
 
     const modal = writable(null);
     let currModal = "";
@@ -32,6 +34,14 @@
                 // @ts-ignore
                 modal.set(CustomizationModal);
             }
+            if ($SessionStore.modalType == "store") {
+                // @ts-ignore
+                modal.set(StoreModal);
+            }
+            if ($SessionStore.modalType == "dailyReward") {
+                // @ts-ignore
+                modal.set(DailyReward);
+            }
             currModal = $SessionStore.modalType;
             counter = $SessionStore.counter;
         }
diff --git a/src/routes/components/DailyReward.svelte b/src/routes/components/DailyReward.svelte
new file mode 100644
index 0000000..6c6a205
--- /dev/null
+++ b/src/routes/components/DailyReward.svelte
@@ -0,0 +1,21 @@
+<script>
+    import UserInfoStore from "../../UserInfoStore";
+    import { addLastLogin } from "../../Firebase";
+
+
+
+    let newLogin = Date.now();
+    let newLoginDate = new Date(newLogin).getDate();
+        // newLogin = newLogin.getDate();
+        // console.log($UserInfoStore.lastLogin.toString());
+    let lastLoginDate = new Date ($UserInfoStore.lastLogin).getDate();
+
+    console.log("newLogin", newLoginDate);
+    console.log("lastLogin", lastLoginDate);
+
+    addLastLogin(newLogin);
+</script>
+
+<h1>Daily Reward!</h1>
+<h3>Welcome back!</h3>
+<h3>You earned 100 coins!</h3>
\ No newline at end of file
diff --git a/src/routes/components/StoreModal.svelte b/src/routes/components/StoreModal.svelte
new file mode 100644
index 0000000..282a0b7
--- /dev/null
+++ b/src/routes/components/StoreModal.svelte
@@ -0,0 +1,180 @@
+<script>
+
+    import UserInfoStore from "../../UserInfoStore";
+    import { buyRoom } from "../../Firebase";
+
+    const bed_room_inventory = [
+        {
+            item_name: "Bed-1",
+            item_type: "Bed",
+            price: 100
+        },
+        {
+            item_name: "Bed-2",
+            item_type: "Bed",
+            price: 500
+        },
+        {
+            item_name: "Desk-1",
+            item_type: "Desk",
+            price: 100
+        },
+        {
+            item_name: "Desk-2",
+            item_type: "Desk",
+            price: 300
+        }
+        ,
+        {
+            item_name: "wallpaper-blue",
+            item_type: "Wallpaper",
+            price: 200
+        }
+        ,
+        {
+            item_name: "wallpaper-pink",
+            item_type: "Wallpaper",
+            price: 500
+        }
+    ]
+    const library_inventory = [
+        {
+            item_name: "Bookshelf-1",
+            item_type: "Bookshelf",
+            price: 100
+        },
+        {
+            item_name: "Bookshelf-2",
+            item_type: "Bookshelf",
+            price: 200
+        },
+        {
+            item_name: "Chair-1",
+            item_type: "Chair",
+            price: 100
+        },
+        {
+            item_name: "Chair-2",
+            item_type: "Chair",
+            price: 200
+        }
+    ]
+
+    const getClass = (/** @type {number} */ userCoins, /** @type {number} */ price) => {
+        if (userCoins >= price) {
+            return "valid"
+        }
+        return "invalid"
+    }
+
+    // @ts-ignore
+    const purchase = (room, price) => {
+        if ($UserInfoStore.coins >= price) {
+            console.log("dfshsfjk");
+            buyRoom(room, price);
+        }
+    }
+    var currentRoom = "Bed_Room";
+
+</script>
+
+<style>
+    .button {
+        display: block;
+        /* margin: auto; */
+        margin-bottom: 1rem;
+        background-color: #F8DEC7;
+        border: none;
+        font-family: "Porpora-Regular";
+        font-size: 2rem;
+        padding: 1rem;
+        border-radius: 1.5rem;
+        color: #DC83A4;
+    }
+
+    .valid {
+        cursor: pointer;
+    }
+
+    .invalid {
+        opacity: 0.5;
+    }
+    .room-nav{
+        display: flex;
+    }
+    .room-options{
+        width: 50%;
+    }
+
+    .underlined {
+        padding-bottom: 0.25rem;
+        border-bottom: solid 1px white;
+        margin-bottom: 0.75rem;
+        font-size: 1.25rem;
+    }
+    .store {
+        overflow-y: scroll;
+        max-height: 60vh;
+    }
+
+    ::-webkit-scrollbar {
+        width: 0.4rem;
+    }
+
+    ::-webkit-scrollbar-thumb {
+        background: white;
+        border-radius: 0.2rem;
+    }
+</style>
+
+<div class="test">
+    <h1>Store</h1>
+    <div class="room-nav">
+        <div class="room-options" id="bed-room">
+            <button on:click={() => {currentRoom = "Bed_Room"}} class="button"> Bed Room</button>
+        </div>
+        <div class="room-options" id="library">
+            <button on:click={() => {currentRoom = "Library"}} class="button"> Library </button>
+        </div>
+    </div>
+    <div class="store">
+    {#if currentRoom=="Bed_Room"}
+        <div class="underlined">Desk</div>
+        {#each bed_room_inventory as decoration}
+            {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Desk"}
+                <button on:click={() => purchase(decoration.item_name, decoration.price)} class="button {getClass($UserInfoStore.coins, decoration.price)}">{decoration.item_name} - {decoration.price}</button>
+            {/if}
+        {/each}
+        <div class="underlined">Bed</div>
+        {#each bed_room_inventory as decoration}
+            {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Bed"}
+                <button on:click={() => purchase(decoration.item_name, decoration.price)} class="button {getClass($UserInfoStore.coins, decoration.price)}">{decoration.item_name} - {decoration.price}</button>
+            {/if}
+        {/each}
+        <div class="underlined">Wallpaper</div>
+        {#each bed_room_inventory as decoration}
+            {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Wallpaper"}
+                <button on:click={() => purchase(decoration.item_name, decoration.price)} class="button {getClass($UserInfoStore.coins, decoration.price)}">{decoration.item_name} - {decoration.price}</button>
+            {/if}
+        {/each}
+    {:else}
+        <div class="underlined">Bookshelf</div>
+        {#each library_inventory as decoration}
+            {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Bookshelf"}
+                <button on:click={() => purchase(decoration.item_name, decoration.price)} class="button {getClass($UserInfoStore.coins, decoration.price)}">{decoration.item_name} - {decoration.price}</button>
+            {/if}
+        {/each}
+        <div class="underlined">Chair</div>
+        {#each library_inventory as decoration}
+            {#if !$UserInfoStore.decorations.includes(decoration.item_name) && decoration.item_type == "Chair"}
+                <button on:click={() => purchase(decoration.item_name, decoration.price)} class="button {getClass($UserInfoStore.coins, decoration.price)}">{decoration.item_name} - {decoration.price}</button>
+            {/if}
+        {/each}
+    {/if}
+</div>
+    
+    
+
+    
+
+</div>