diff --git a/package-lock.json b/package-lock.json
index 24bc2e3..e16da2c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3075,7 +3075,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -3096,12 +3097,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -3116,17 +3119,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -3243,7 +3249,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -3255,6 +3262,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -3269,6 +3277,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -3276,12 +3285,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -3300,6 +3311,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -3380,7 +3392,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -3392,6 +3405,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -3477,7 +3491,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -3513,6 +3528,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -3532,6 +3548,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -3575,12 +3592,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         },
@@ -7465,7 +7484,8 @@
             "ansi-regex": {
               "version": "2.1.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "aproba": {
               "version": "1.2.0",
@@ -7486,12 +7506,14 @@
             "balanced-match": {
               "version": "1.0.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "brace-expansion": {
               "version": "1.1.11",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "balanced-match": "^1.0.0",
                 "concat-map": "0.0.1"
@@ -7506,17 +7528,20 @@
             "code-point-at": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "concat-map": {
               "version": "0.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "console-control-strings": {
               "version": "1.1.0",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "core-util-is": {
               "version": "1.0.2",
@@ -7633,7 +7658,8 @@
             "inherits": {
               "version": "2.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "ini": {
               "version": "1.3.5",
@@ -7645,6 +7671,7 @@
               "version": "1.0.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "number-is-nan": "^1.0.0"
               }
@@ -7659,6 +7686,7 @@
               "version": "3.0.4",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "brace-expansion": "^1.1.7"
               }
@@ -7666,12 +7694,14 @@
             "minimist": {
               "version": "0.0.8",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "minipass": {
               "version": "2.3.5",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "safe-buffer": "^5.1.2",
                 "yallist": "^3.0.0"
@@ -7690,6 +7720,7 @@
               "version": "0.5.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "minimist": "0.0.8"
               }
@@ -7770,7 +7801,8 @@
             "number-is-nan": {
               "version": "1.0.1",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "object-assign": {
               "version": "4.1.1",
@@ -7782,6 +7814,7 @@
               "version": "1.4.0",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "wrappy": "1"
               }
@@ -7867,7 +7900,8 @@
             "safe-buffer": {
               "version": "5.1.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "safer-buffer": {
               "version": "2.1.2",
@@ -7903,6 +7937,7 @@
               "version": "1.0.2",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "code-point-at": "^1.0.0",
                 "is-fullwidth-code-point": "^1.0.0",
@@ -7922,6 +7957,7 @@
               "version": "3.0.1",
               "bundled": true,
               "dev": true,
+              "optional": true,
               "requires": {
                 "ansi-regex": "^2.0.0"
               }
@@ -7965,12 +8001,14 @@
             "wrappy": {
               "version": "1.0.2",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             },
             "yallist": {
               "version": "3.0.3",
               "bundled": true,
-              "dev": true
+              "dev": true,
+              "optional": true
             }
           }
         }
@@ -13061,14 +13099,14 @@
       "dev": true
     },
     "tiny-invariant": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.4.tgz",
-      "integrity": "sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g=="
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.6.tgz",
+      "integrity": "sha512-FOyLWWVjG+aC0UqG76V53yAWdXfH8bO6FNmyZOuUrzDzK8DI3/JRY25UD7+g49JWM1LXwymsKERB+DzI0dTEQA=="
     },
     "tiny-warning": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz",
-      "integrity": "sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q=="
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
+      "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
     },
     "tmp": {
       "version": "0.0.33",
diff --git a/package.json b/package.json
index cd45697..265b063 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "react": "*",
     "react-dom": "*",
     "react-redux": "*",
-    "react-router-dom": "*",
+    "react-router-dom": "^5.0.1",
     "redux": "*"
   },
   "scripts": {
diff --git a/src/App.js b/src/App.js
index 15bddc9..92ca12b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,23 +1,43 @@
 import React from "react";
 import TopNav from "./components/TopNav";
 import SideNav from "./components/SideNav";
+import Dashboard from './components/Dashboard'
+import Charts from './components/Charts';
+import Tables from './components/Tables';
+import Wall from './components/Wall';
+import Settings from './components/Settings';
+import Profiles from './components/Profiles';
+import Profile from './components/Profile';
+import Marquee from './components/Marquee';
+import {BrowserRouter, Route, Switch} from 'react-router-dom';
 
 function App() {
   return (
-    <div> 
-      <div id="wrapper">
-        <nav className="navbar navbar-inverse navbar-fixed-top" role="navigation">
-          <TopNav />
-          <SideNav />
-        </nav>
-        <div style={{backgroundColor: "white"}}>
-          {/* PUT YOUR ROUTES HERE */}
+    <BrowserRouter>
+      <div> 
+        <div id="wrapper">
+          <nav className="navbar navbar-inverse navbar-fixed-top" role="navigation">
+            <TopNav />
+            <SideNav />
+          </nav>
+          <div style={{backgroundColor: "white"}}>
+            {
+              <Switch>
+                <Route path='/charts' component={Charts} />
+                <Route path='/tables' component={Tables} />
+                <Route path='/settings' component={Settings} />
+                <Route path='/wall' component={Wall} />
+                <Route path='/profiles' component={Profiles} />
+                <Route path='/marquee/:text' component={Marquee} />
+                <Route path='/profile/:id' component={Profile} />
+                <Route path='/' component={Dashboard} />
+              </Switch>
+            }
+          </div>
         </div>
       </div>
-    </div>
-
+    </BrowserRouter>
   );
 }
 
-
-export default App;
+export default App;
\ No newline at end of file
diff --git a/src/components/Charts.js b/src/components/Charts.js
new file mode 100644
index 0000000..26a2e14
--- /dev/null
+++ b/src/components/Charts.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function Charts() {
+    return (
+        <div>
+            <i className="fa fa-fw fa-bar-chart-o" /> Charts
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/src/components/Marquee.js b/src/components/Marquee.js
index 820e8c4..6a8c835 100644
--- a/src/components/Marquee.js
+++ b/src/components/Marquee.js
@@ -1,9 +1,11 @@
 import React from "react";
 
 function Marquee(props) {
-  const message = "hello";
-  return (   
-    <marquee>{message}</marquee>
+  const message = props.match.params.text;
+  return (
+    <div>
+      <marquee>{message}</marquee>
+    </div>
   );
 }
 
diff --git a/src/components/Profile.js b/src/components/Profile.js
index c4eb646..7cc69ac 100644
--- a/src/components/Profile.js
+++ b/src/components/Profile.js
@@ -2,7 +2,7 @@ import React from "react";
 import {connect} from "react-redux";
 
 function Profile(props) {
-  const userId = 0;
+  const userId = props.match.params.id;
   const user = props.users.find(u => u.id == userId) || {};
   return (   
     <div>
diff --git a/src/components/Profiles.js b/src/components/Profiles.js
index 3409812..f1b1e8a 100644
--- a/src/components/Profiles.js
+++ b/src/components/Profiles.js
@@ -1,12 +1,13 @@
 import React from "react";
 import {connect} from "react-redux";
+import {Link} from 'react-router-dom';
 
 function Profiles(props) {
   const userDivs = props.users.map((user,i) => {
     return (
       <div key={i}>
         {user.firstName} - {user.lastName}
-        <a href="#"> View </a>
+        <Link to={"/profile/" + user.id}> View </Link>
       </div>);
   });
   return (   
diff --git a/src/components/Settings.js b/src/components/Settings.js
new file mode 100644
index 0000000..838c510
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function Settings() {
+    return (
+        <div>
+            <i class="fa fa-sliders" aria-hidden="true" /> Settings
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/src/components/SideNav.js b/src/components/SideNav.js
index 9caaf7c..427b556 100644
--- a/src/components/SideNav.js
+++ b/src/components/SideNav.js
@@ -1,26 +1,30 @@
 import React from "react";
-// import {Link} from "react-router-dom";
+import {Link} from "react-router-dom";
 
 function SideNav() {
   return (
     <div className="collapse navbar-collapse navbar-ex1-collapse">
       <ul className="nav navbar-nav side-nav">
         <li className="active">
-          {/*
-          <Link to="/"> <i className="fa fa-fw fa-dashboard" />
-            Dashboard 
-          </Link>
-          */}
+          <Link to="/"> <i className="fa fa-fw fa-dashboard" /> Dashboard</Link>
         </li>
         <li>
-          <a href="charts.html">
-            <i className="fa fa-fw fa-bar-chart-o" /> Charts
-          </a>
+          <Link to="/charts"> <i className="fa fa-fw fa-bar-chart-o" /> Charts</Link>
         </li>
         <li>
-          <a href="tables.html">
-            <i className="fa fa-fw fa-table" /> Tables
-          </a>
+          <Link to="/tables"> <i className="fa fa-fw fa-table" /> Tables</Link>
+        </li>
+        <li>
+          <Link to="/settings"> <i class="fa fa-sliders" aria-hidden="true" /> Settings</Link>
+        </li>
+        <li>
+          <Link to='/wall'> <i class="fa fa-anchor" aria-hidden="true" /> Wall</Link>
+        </li>
+        <li>
+          <Link to='/profiles'> <i class="fa fa-users" aria-hidden="true" /> Profiles</Link>
+        </li>
+        <li>
+          <Link to='/marquee/This is what a Marquee does!'> <i class="fa fa-bullhorn" aria-hidden="true"></i> Look What I Can Do</Link>
         </li>
       </ul>
     </div>);  
diff --git a/src/components/Tables.js b/src/components/Tables.js
new file mode 100644
index 0000000..5ffc022
--- /dev/null
+++ b/src/components/Tables.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function Tables() {
+    return (
+        <div>
+            <i className="fa fa-fw fa-table" /> Tables
+        </div>
+    )
+}
\ No newline at end of file
diff --git a/src/components/Wall.js b/src/components/Wall.js
new file mode 100644
index 0000000..cd77372
--- /dev/null
+++ b/src/components/Wall.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+export default function Wall() {
+    return (
+        <duiv>
+            <i class="fa fa-anchor" aria-hidden="true"></i> Wall
+        </duiv>
+    )
+}
\ No newline at end of file