diff --git a/package-lock.json b/package-lock.json
index 24bc2e3..6290f42 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
             }
           }
         }
diff --git a/package.json b/package.json
index cd45697..9e6f256 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,6 @@
   "scripts": {
     "start": "react-scripts start"
   },
-  "proxy": "http://localhost:3001",
   "browserslist": {
     "production": [
       ">0.2%",
diff --git a/src/App.js b/src/App.js
index 15bddc9..7521595 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,9 +1,19 @@
 import React from "react";
 import TopNav from "./components/TopNav";
 import SideNav from "./components/SideNav";
+import Dashboard from "./components/Dashboard"
+import Profiles from "./components/Profiles"
+import Charts from "./components/Charts"
+import Tables from "./components/Tables"
+import Settings from "./components/Settings"
+import Marquee from "./components/Marquee"
+import Profile from "./components/Profile"
+import Wall from "./components/Wall"
+import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 
 function App() {
   return (
+    <Router>
     <div> 
       <div id="wrapper">
         <nav className="navbar navbar-inverse navbar-fixed-top" role="navigation">
@@ -11,11 +21,18 @@ function App() {
           <SideNav />
         </nav>
         <div style={{backgroundColor: "white"}}>
-          {/* PUT YOUR ROUTES HERE */}
+          <Route path='/' exact component={Dashboard}/>
+          <Route path='/profiles' exact component={Profiles}/>
+          <Route path='/profile/:id' exact component={Profile}/>
+          <Route path='/charts' exact component={Charts}/>
+          <Route path='/tables' exact component={Tables}/>
+          <Route path='/settings' exact component={Settings}/>
+          <Route path='/wall' exact component={Wall}/>
+          <Route path='/marquee/:text' exact component={Marquee}/>
         </div>
       </div>
     </div>
-
+    </Router>
   );
 }
 
diff --git a/src/components/Charts.js b/src/components/Charts.js
new file mode 100644
index 0000000..ebc9310
--- /dev/null
+++ b/src/components/Charts.js
@@ -0,0 +1,7 @@
+import React from "react"
+
+export default function Charts(){
+    return(
+        <div>Get some charts</div>
+    )
+}
\ No newline at end of file
diff --git a/src/components/Marquee.js b/src/components/Marquee.js
index 820e8c4..21565c7 100644
--- a/src/components/Marquee.js
+++ b/src/components/Marquee.js
@@ -1,7 +1,7 @@
 import React from "react";
 
 function Marquee(props) {
-  const message = "hello";
+  const message = props.match.params.text;
   return (   
     <marquee>{message}</marquee>
   );
diff --git a/src/components/Settings.js b/src/components/Settings.js
new file mode 100644
index 0000000..73c186d
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,10 @@
+import React from 'react'
+import {connect} from 'react-redux'
+
+export default function Settings(props){
+    return(
+        <div>You need to make some settings</div>
+    )}
+
+
+
diff --git a/src/components/SideNav.js b/src/components/SideNav.js
index 9caaf7c..df370ca 100644
--- a/src/components/SideNav.js
+++ b/src/components/SideNav.js
@@ -1,26 +1,36 @@
 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>
-          */}
         </li>
         <li>
-          <a href="charts.html">
+          <Link to="/charts/">
             <i className="fa fa-fw fa-bar-chart-o" /> Charts
-          </a>
+          </Link>
         </li>
         <li>
-          <a href="tables.html">
+          <Link to="/tables/">
             <i className="fa fa-fw fa-table" /> Tables
-          </a>
+          </Link>
+          <Link to="/profiles/">
+            <i /> Profiles
+          </Link>
+          <Link to="/marquee/iloveroutes">
+            <i /> Marquee
+          </Link>
+          <Link to="/wall/">
+            <i /> Wall
+          </Link>
+          <Link to="/settings/">
+            <i /> Settings
+          </Link>
         </li>
       </ul>
     </div>);  
diff --git a/src/components/Tables.js b/src/components/Tables.js
new file mode 100644
index 0000000..1a6a533
--- /dev/null
+++ b/src/components/Tables.js
@@ -0,0 +1,6 @@
+import React from "react"
+
+export default function Tables(){
+    return(
+        <div>Get some 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..a5ade3c
--- /dev/null
+++ b/src/components/Wall.js
@@ -0,0 +1,6 @@
+import React from 'react'
+
+export default function Wall(){
+    return(
+    <div>Tear down this wall</div>
+    )}
\ No newline at end of file