diff --git a/JS/.DS_Store b/JS/.DS_Store
index a10cbf04e1a822c75a63bf7982ae3dbfca390c92..1e8b9d044eb1d7782b5834a2fd0d7dfd66e88a8e 100644
Binary files a/JS/.DS_Store and b/JS/.DS_Store differ
diff --git a/JS/MOMENTUM/app.js b/JS/MOMENTUM/app.js
deleted file mode 100644
index 6067506623d394ddd67252fa0e94fa8bee090282..0000000000000000000000000000000000000000
--- a/JS/MOMENTUM/app.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const loginForm = document.querySelector("#login-form");
-const loginInput = document.querySelector("#login-form input");
-const greeting = document.querySelector("#greeting");
-function onLoginSubmit(event) {
-    event.preventDefault();
-    loginForm.classList.add("hidden");
-    const username = loginInput.value;
-    console.log(username);
-}
-
-function handleLinkClick(event) {
-    event.preventDefault();
-    const username = loginInput.value;
-    loginForm.classList.add("hidden");
-    greeting.innerText = "Hello" + username;
-}
-
-loginForm.addEventListener("submit", onLoginSubmit);
-link.addEventListener("click", handleLinkClick);
\ No newline at end of file
diff --git a/JS/MOMENTUM/style.css b/JS/MOMENTUM/css/style.css
similarity index 100%
rename from JS/MOMENTUM/style.css
rename to JS/MOMENTUM/css/style.css
diff --git a/JS/MOMENTUM/index.html b/JS/MOMENTUM/index.html
index 2af221f84156fb0f1003a5b32b1ace93ab965165..5dda2c1e09e94a3d7ff7afe61b2e6128593cc3a1 100644
--- a/JS/MOMENTUM/index.html
+++ b/JS/MOMENTUM/index.html
@@ -7,7 +7,7 @@
         <title>Momentum App</title>
     </head>
     <body>
-        <form id="login-form>
+        <form class="hidden" id="login-form">
             <input 
                 required
                 maxlength="15"
@@ -17,7 +17,6 @@
             <input type="submit" value="Log In" />
         </form>
         <h1 id="greeting" class="hidden"></h1>
-        <a href="https://nomadcoders.co">Go to courses</a>
         <script src="app.js"></script>
     </body>
 </html>
\ No newline at end of file
diff --git a/JS/MOMENTUM/js/greetings.js b/JS/MOMENTUM/js/greetings.js
new file mode 100644
index 0000000000000000000000000000000000000000..576cec01d761a643796e742ec9859f7a5b195060
--- /dev/null
+++ b/JS/MOMENTUM/js/greetings.js
@@ -0,0 +1,30 @@
+const loginForm = document.querySelector("#login-form");
+const loginInput = document.querySelector("#login-form input");
+const greeting = document.querySelector("#greeting");
+
+const HIDDEN_CLASSNAME = "hidden";
+const USERNAME_KEY = "username";
+
+function onLoginSubmit(event) {
+    event.preventDefault();
+    loginForm.classList.add(HIDDEN_CLASSNAME);
+    const username = loginInput.value;
+    localStorage.setItem(USERNAME_KEY, username);
+    paintGreetings();
+}
+
+function paintGreetings() {
+    const username = localStorage.getItem(USERNAME_KEY);
+    greeting.innerText = `Hello ${username}`;
+    greeting.classList.remove(HIDDEN_CLASSNAME);
+}
+
+const savedUsername = localStorage.getItem(USERNAME_KEY);
+
+if(savedUsername === null){
+    loginForm.classList.remove(HIDDEN_CLASSNAME);
+    loginForm.addEventListener("submit", onLoginSubmit);
+}
+else{
+    paintGreetings();
+}
\ No newline at end of file