diff --git a/.gitignore b/.gitignore
index 6c96c5c..b0a8c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ build
 .DS_Store
 .env
 npm-debug.log
+*.swp
diff --git a/package.json b/package.json
index ba2f6ca..84c0e3a 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "react": "^15.3.2",
     "react-dom": "^15.3.2",
     "react-redux": "^5.0.4",
-    "react-router-dom": "^4.1.1",
+    "react-router-dom": "^4.2.2",
     "redux": "^3.6.0"
   },
   "scripts": {
diff --git a/src/App.js b/src/App.js
index 15bddc9..b682205 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,21 +1,40 @@
 import React from "react";
 import TopNav from "./components/TopNav";
 import SideNav from "./components/SideNav";
+import Charts from "./components/Charts";
+import Tables from "./components/Tables";
+import Settings from "./components/Settings";
+import Wall from "./components/Wall";
+import Profiles from "./components/Profiles";
+import Marquee from "./components/Marquee";
+import Profile from "./components/Profile";
+import Dashboard from "./components/Dashboard";
+import {BrowserRouter,Switch,Route} 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>
   );
 }
 
diff --git a/src/components/Charts.js b/src/components/Charts.js
new file mode 100644
index 0000000..3ad1b11
--- /dev/null
+++ b/src/components/Charts.js
@@ -0,0 +1,8 @@
+import React from 'react';
+
+export default function Charts() {
+  return  (
+    <img src="http://xkcdsw.com/content/img/907.png"></img>
+  );
+}
+
diff --git a/src/components/Marquee.js b/src/components/Marquee.js
index 820e8c4..41908b6 100644
--- a/src/components/Marquee.js
+++ b/src/components/Marquee.js
@@ -1,9 +1,12 @@
 import React from "react";
 
 function Marquee(props) {
-  const message = "hello";
+  const message = props.match.params.text;
   return (   
-    <marquee>{message}</marquee>
+    <div>
+      <marquee>{message}</marquee>
+      <img src="https://imgs.xkcd.com/comics/home_organization.png"></img>
+    </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..3bb099f 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..d355c1b
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,8 @@
+import React from 'react';
+
+export default function Settings() {
+  return (
+    <img src="https://imgs.xkcd.com/comics/christmas_settings.png"></img>
+  );
+}
+
diff --git a/src/components/SideNav.js b/src/components/SideNav.js
index 9caaf7c..f9c4ab6 100644
--- a/src/components/SideNav.js
+++ b/src/components/SideNav.js
@@ -1,26 +1,54 @@
 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>
+        </li>
+        <li>
+          <Link to="/settings">
+            <i className="fa fa-fw fa-cogs" /> Settings
+          </Link>
+        </li>
+        <li>
+          <Link to="/wall">
+            <i className="fa fa-fw fa-facebook" /> Wall
+          </Link>
+        </li>
+        <li>
+          <Link to="/profiles">
+            <i className="fa fa-fw fa-user" /> Profiles
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/iloveroutes">
+            <i className="fa fa-fw fa-heart" /> iloveroutes
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/reactrouterules">
+            <i className="fa fa-fw fa-road" /> reactrouterules
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/poooooops">
+            <i className="fa fa-fw fa-fire" /> poooooops
+          </Link>
         </li>
       </ul>
     </div>);  
diff --git a/src/components/Tables.js b/src/components/Tables.js
new file mode 100644
index 0000000..04508a8
--- /dev/null
+++ b/src/components/Tables.js
@@ -0,0 +1,8 @@
+import React from 'react';
+
+export default function Tables() {
+  return (
+    <img src="https://imgs.xkcd.com/comics/exploits_of_a_mom.png"></img>
+  );
+}
+
diff --git a/src/components/Wall.js b/src/components/Wall.js
new file mode 100644
index 0000000..856de41
--- /dev/null
+++ b/src/components/Wall.js
@@ -0,0 +1,8 @@
+import React from 'react';
+
+export default function Wall() {
+  return (
+    <img src="https://imgs.xkcd.com/comics/contextbot.png"></img>
+  );
+}
+