diff --git a/package-lock.json b/package-lock.json
index 0bfb509..478eef8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-router": "^5.2.0",
-        "react-router-dom": "^5.2.0",
+        "react-router-dom": "^6.16.0",
         "react-scripts": "^5.0.1",
         "web-vitals": "^2.1.4"
       }
@@ -3342,6 +3342,14 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
+    "node_modules/@remix-run/router": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz",
+      "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA==",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -15452,20 +15460,33 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz",
+      "integrity": "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg==",
       "dependencies": {
-        "@babel/runtime": "^7.1.2",
-        "history": "^4.9.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-router": "5.2.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.9.0",
+        "react-router": "6.16.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "react": ">=15"
+        "react": ">=16.8",
+        "react-dom": ">=16.8"
+      }
+    },
+    "node_modules/react-router-dom/node_modules/react-router": {
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz",
+      "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==",
+      "dependencies": {
+        "@remix-run/router": "1.9.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8"
       }
     },
     "node_modules/react-router/node_modules/isarray": {
@@ -21033,6 +21054,11 @@
       "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
       "peer": true
     },
+    "@remix-run/router": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz",
+      "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA=="
+    },
     "@rollup/plugin-babel": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -29732,17 +29758,22 @@
       }
     },
     "react-router-dom": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz",
-      "integrity": "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA==",
+      "version": "6.16.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz",
+      "integrity": "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg==",
       "requires": {
-        "@babel/runtime": "^7.1.2",
-        "history": "^4.9.0",
-        "loose-envify": "^1.3.1",
-        "prop-types": "^15.6.2",
-        "react-router": "5.2.0",
-        "tiny-invariant": "^1.0.2",
-        "tiny-warning": "^1.0.0"
+        "@remix-run/router": "1.9.0",
+        "react-router": "6.16.0"
+      },
+      "dependencies": {
+        "react-router": {
+          "version": "6.16.0",
+          "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz",
+          "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==",
+          "requires": {
+            "@remix-run/router": "1.9.0"
+          }
+        }
       }
     },
     "react-scripts": {
diff --git a/package.json b/package.json
index 37c6f92..5a29f35 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^6.16.0",
     "react-scripts": "^5.0.1",
     "web-vitals": "^2.1.4"
   },
diff --git a/src/Components/Controls.js b/src/Components/Controls.js
index 3287810..b712cba 100644
--- a/src/Components/Controls.js
+++ b/src/Components/Controls.js
@@ -13,6 +13,7 @@ class Controls extends React.Component
     return(
       <div className="Frame">
           <div className='Title'>Legendary</div>
+          
           <div className='minimize btControl' onClick={this.minimize}><span>_</span></div>
           <div className='Maximize btControl' onClick={this.maximize}><span>-</span></div>
           <div className='Close btControl' onClick={this.close}><span>X</span></div>
diff --git a/src/Components/Login.css b/src/Components/Login.css
index bea46a3..e5517ba 100644
--- a/src/Components/Login.css
+++ b/src/Components/Login.css
@@ -32,9 +32,3 @@ span
     position: relative;
     left:2em;
 }
-.Register
-{
-    float:right;
-    position: relative;
-    right: 1em;
-}
\ No newline at end of file
diff --git a/src/Components/Login.js b/src/Components/Login.js
index b50f17e..2825cdc 100644
--- a/src/Components/Login.js
+++ b/src/Components/Login.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import './Login.css';
 
+
 class Login extends React.Component
 {
     constructor()
@@ -9,13 +10,6 @@ class Login extends React.Component
         this.isPWValid = false;
         this.receive();
     }
-    callRegister()
-    {
-        var date = new Date( new Date().setTime(new Date().getTime()+10000)).toGMTString();
-        document.cookie = document.cookie+ 'nextPage=Register; expires='+date+';';
-        window.location.reload();
-
-    }
     validateConstraints(event) 
     {
         event.preventDefault();
@@ -52,7 +46,7 @@ class Login extends React.Component
     handleKeyDown(event)
     {
         if (event.keyCode === 13 ) {
-             event.preventDefault();
+            event.preventDefault();
         }
     }
     receive()
@@ -65,6 +59,7 @@ class Login extends React.Component
     }
     render()
     {   
+
         return(
             <div className='container'>
                 <form id='form' className='loginForm'>
@@ -72,8 +67,7 @@ class Login extends React.Component
                     <input required className='emailInput'  type="email" placeholder=" " onKeyDown={this.handleKeyDown} onInvalid={this.emailValidity}></input>
                     <label><span>Password</span></label>
                     <input required className='password' type="password" onKeyDown={this.handleKeyDown} autoComplete="current-password" ></input>
-                    <button className='bt Login'  onClick={this.validateConstraints}>Login</button>
-                    <button className='bt Register' type='button' onClick={this.callRegister} > Register</button>
+                    <button className='bt Login'  onClick={this.validateConstraints}>Login</button>                      
                 </form>
             </div>
         )
diff --git a/src/Components/Navigation.css b/src/Components/Navigation.css
index e69de29..f7d6f63 100644
--- a/src/Components/Navigation.css
+++ b/src/Components/Navigation.css
@@ -0,0 +1,17 @@
+.navBar
+{
+    position: fixed;
+    top:0;
+    padding-top:2em;
+    display: flex;
+}
+.navItem
+{
+    color: ivory;
+    padding-left: 2.5em;
+    text-decoration: none;
+}
+.navBar::frist-child
+{
+    padding-left:1em;
+}
\ No newline at end of file
diff --git a/src/Components/Navigation.js b/src/Components/Navigation.js
index ead2cd3..86488b2 100644
--- a/src/Components/Navigation.js
+++ b/src/Components/Navigation.js
@@ -1,68 +1,34 @@
 import './Navigation.css';
-import {HashRouter,Link,Route,Switch} from "react-router-dom";
+import {HashRouter,Link,Route,Routes} from "react-router-dom";
 
 import Login from "../Components/Login";
-import Register from "../Components/RegisterForm";
 import Games from "../Pages/Games"
 import Listener from "../Pages/Listener"
 import Leagues from "../Pages/Leagues"
+import Home from "../Pages/Home"
 import React from "react";
 
 class Navigation extends React.Component
 {
-  Leagues = ()=>{
-    return(
-        <Leagues/>
-      )
-  }
-  login = ()=>{
-      return(
-          <Login/>
-      )
-  }
-  Register = ()=>{
-      return(
-          <Register/>
-      )
-  }
-
-
-  Games = ()=>{
-      return(
-          <Games/>
-      )
-  }
-
-  Listener = ()=>{
-      return(
-          <Listener/>
-      )
-  }
-  goToGames()
+  render()
   {
-    var date = new Date( new Date().setTime(new Date().getTime()+250)).toGMTString();
-    document.cookie = document.cookie+ 'nextPage=Register; expires='+date+';';
-    window.location.reload();
-  }
-  goToLeagues()
-  {
-    var date = new Date( new Date().setTime(new Date().getTime()+250)).toGMTString();
-    document.cookie = document.cookie+ 'nextPage=Register; expires='+date+';';
-    window.location.reload();
-  }
-
-  // render()
-  // {
-  //   return(
-  //     <div className="Navbar">
-  //         <div className='Title'>
-  //           {/* SVG LOGO */}
-  //         </div>
-  //         <div className='Leagues navbt' onClick={this.goToLeagues}><span>Leagues</span></div>
-  //         <div className='Games navbt' onClick={this.goToGames}><span>My Games</span></div>
-  //     </div>
-  //   );
-  // }
+      return (
+        <HashRouter>
+          <div className="navBar">
+            <Link className='navItem' to="/"><h2>Home</h2></Link>
+            <Link className='navItem' to="/Leagues"><h2>Leagues</h2></Link>
+            <Link className='navItem' to="/Games"><h2>My Games</h2></Link>
+          </div>
+          <Routes>
+            <Route exact path="/" element={<Home/>}/>
+            <Route exact path="/Leagues" element={<Leagues/>}/>
+            <Route exact path="/Games" element={<Games/>}/>
+            <Route exact path="/Login" element={<Login/>}/>
+            <Route exact path="/Listener" element={<Listener/>}/>
+          </Routes>     
+        </HashRouter>    
+      );
+    }
 }
 
 
diff --git a/src/Pages/Games.js b/src/Pages/Games.js
index 265139a..3c4850e 100644
--- a/src/Pages/Games.js
+++ b/src/Pages/Games.js
@@ -1,4 +1,6 @@
 
+import React from 'react';
+
 function Games() {
     return (
         <div>
diff --git a/src/Pages/Home.css b/src/Pages/Home.css
index e69de29..f21053b 100644
--- a/src/Pages/Home.css
+++ b/src/Pages/Home.css
@@ -0,0 +1,15 @@
+.tempNavBar
+{
+    position: relative;
+    top:3em;
+    display: flex;
+    left: calc(50% - 6em);
+}
+.btTempNav
+{
+    min-width: 5em;
+    text-decoration: none;
+    position: relative;
+    color:ivory;
+    background-color: red;
+}
diff --git a/src/Pages/Home.js b/src/Pages/Home.js
index ca6e4d1..65d8c11 100644
--- a/src/Pages/Home.js
+++ b/src/Pages/Home.js
@@ -1,106 +1,38 @@
 import React from 'react';
-// import {HashRouter,Link,Route,Switch} from "react-router-dom";
-
+import './Home.css'
+import {HashRouter,Link,Route,Routes, redirect} from "react-router-dom";
 
 
 import Login from "../Components/Login";
 import Register from "../Components/RegisterForm";
 import Navigation from "../Components/Navigation";
-import Games from "../Pages/Games"
-import Listener from "../Pages/Listener"
-import Leagues from "../Pages/Leagues"
 const { cookieSlicer } = require("../lib");
 
 function Home() {
     var Hash = cookieSlicer(document.cookie,'Hash');
-    var nextPage = cookieSlicer(document.cookie, 'nextPage');
-    // console.log(nextPage)
-    console.log(Hash)
-    // const Leagues = ()=>{
-    //     return(
-    //         <Leagues/>
-    //     )
-    // }
-    // const Login = ()=>{
-    //     return(
-    //         <Login/>
-    //     )
-    // }
-    // const Register = ()=>{
-    //     return(
-    //         <Register/>
-    //     )
-    // }
-    
-    
-    // const Games = ()=>{
-    //     return(
-    //         <Games/>
-    //     )
-    // }
-    
-    // const Listener = ()=>{
-    //     return(
-    //         <Listener/>
-    //     )
-    // }
-    // return (
-    //     <HashRouter>
-    //     <div className="App">
-    //       <div className="menu">
-    //         <Link to="/"><h2>Home</h2></Link>
-    //         <Link to="/one"><h2>Stand</h2></Link>
-    //         <Link to="/two"><h2>Sit</h2></Link>
-    //       </div>
-    //       <Switch>
-    //         <Route exact path="/" component={Home}/>
-    //         <Route exact path="/Leagues" component={Leagues}/>
-    //         <Route exact path="/Games" component={Games}/>
-    //         <Route exact path="/Login" component={Games}/>
-    //         <Route exact path="/Register" component={Games}/>
-    //       </Switch>     
-    //     </div>
-    //     </HashRouter>    
-    //   );
+    // console.log(Hash)
+
     return (
         
         <div className="BODY">
             {Hash ? 
             (
-                <div>
-                    <Navigation/>
-                    {nextPage==='Leagues'?
-                        (
-                            <Leagues/>
-                        ):
-                        (
-                            <div>
-                                {nextPage==='Games'?
-                                    (
-                                        <Games/>
-                                    ):
-                                    (
-                                        <Listener/>
-                                    )
-                                }
-                            </div>
-                        )
-                    }
-                </div>
+                <Navigation/>
             ) : 
             (
-                <div>
-                    {nextPage==='Register'?
-                        (
-                            <Register />
-                        ):
-                        (
-                            <Login />
-                        )
-                    }
-                </div>
-            )
-            }
+                <HashRouter>
+                        <div className='tempNavBar'>
+
+                            <Link className='btTempNav' to="/"><h2>Login</h2></Link>  
+                            <Link className='btTempNav' to="/Register"><h2>Register</h2></Link>  
+                        </div>
+                        <redirect to="/"/>
+                        <Routes>
+                            <Route exact path="/" element={<Login/>}/>
+                            <Route exact path="/Register" element={<Register/>}/>
+                        </Routes>     
+                    </HashRouter> 
+            )}
         </div>
     );
 
diff --git a/src/Pages/Leagues.js b/src/Pages/Leagues.js
index 001b092..679c089 100644
--- a/src/Pages/Leagues.js
+++ b/src/Pages/Leagues.js
@@ -1,8 +1,14 @@
 
+import React from 'react';
 
 function Leagues() {
 return (
-    <div>
+    <div style={{color:'red'}}>
+        <br></br>
+        <br></br>
+        <br></br>
+        <br></br>
+        FODA-Se
     </div>
 )
 }
diff --git a/yarn.lock b/yarn.lock
index dcc9965..7e4e591 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1686,6 +1686,11 @@
   "resolved" "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz"
   "version" "2.11.8"
 
+"@remix-run/router@1.9.0":
+  "integrity" "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA=="
+  "resolved" "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz"
+  "version" "1.9.0"
+
 "@rollup/plugin-babel@^5.2.0":
   "integrity" "sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q=="
   "resolved" "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz"
@@ -8285,7 +8290,7 @@
     "strip-ansi" "^6.0.1"
     "text-table" "^0.2.0"
 
-"react-dom@^18.0.0", "react-dom@^18.2.0":
+"react-dom@^18.0.0", "react-dom@^18.2.0", "react-dom@>=16.8":
   "integrity" "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g=="
   "resolved" "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz"
   "version" "18.2.0"
@@ -8328,20 +8333,15 @@
   "resolved" "https://registry.npmjs.org/react-refresh/-/react-refresh-0.11.0.tgz"
   "version" "0.11.0"
 
-"react-router-dom@^5.2.0":
-  "integrity" "sha512-gxAmfylo2QUjcwxI63RhQ5G85Qqt4voZpUXSEqCwykV0baaOTQDR1f0PmY8AELqIyVc0NEZUj0Gov5lNGcXgsA=="
-  "resolved" "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.2.0.tgz"
-  "version" "5.2.0"
+"react-router-dom@^6.16.0":
+  "integrity" "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg=="
+  "resolved" "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz"
+  "version" "6.16.0"
   dependencies:
-    "@babel/runtime" "^7.1.2"
-    "history" "^4.9.0"
-    "loose-envify" "^1.3.1"
-    "prop-types" "^15.6.2"
-    "react-router" "5.2.0"
-    "tiny-invariant" "^1.0.2"
-    "tiny-warning" "^1.0.0"
+    "@remix-run/router" "1.9.0"
+    "react-router" "6.16.0"
 
-"react-router@^5.2.0", "react-router@5.2.0":
+"react-router@^5.2.0":
   "integrity" "sha512-smz1DUuFHRKdcJC0jobGo8cVbhO3x50tCL4icacOlcwDOEQPq4TMqwx3sY1TP+DvtTgz4nm3thuo7A+BK2U0Dw=="
   "resolved" "https://registry.npmjs.org/react-router/-/react-router-5.2.0.tgz"
   "version" "5.2.0"
@@ -8357,6 +8357,13 @@
     "tiny-invariant" "^1.0.2"
     "tiny-warning" "^1.0.0"
 
+"react-router@6.16.0":
+  "integrity" "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA=="
+  "resolved" "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz"
+  "version" "6.16.0"
+  dependencies:
+    "@remix-run/router" "1.9.0"
+
 "react-scripts@^5.0.1":
   "integrity" "sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ=="
   "resolved" "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz"
@@ -8412,7 +8419,7 @@
   optionalDependencies:
     "fsevents" "^2.3.2"
 
-"react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "react@^18.0.0", "react@^18.2.0", "react@>= 16", "react@>=15":
+"react@^0.14.0 || ^15.0.0 || ^16.0.0 || ^17.0.0", "react@^18.0.0", "react@^18.2.0", "react@>= 16", "react@>=15", "react@>=16.8":
   "integrity" "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ=="
   "resolved" "https://registry.npmjs.org/react/-/react-18.2.0.tgz"
   "version" "18.2.0"