diff --git a/package.json b/package.json
index ba2f6ca..1407117 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "start": "nf start",
     "lint": "eslint src",
     "react-app": "react-scripts start",
-    "api": "json-server --id _id --watch --port 4000 db.json",
+    "api": "json-server --id _id --watch --port 3000 db.json",
     "build": "react-scripts build",
     "test": "npm run lint && react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
diff --git a/src/App.js b/src/App.js
index 15bddc9..8fd45b6 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,21 +1,42 @@
 import React from "react";
 import TopNav from "./components/TopNav";
 import SideNav from "./components/SideNav";
+import { BrowserRouter, Switch, Route } from "react-router-dom"
+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";
 
 function App() {
   return (
-    <div> 
+    <BrowserRouter>
+    <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 */}
+          <div>
+          <Switch>
+            <Route path="/charts" component={Charts} />
+            <Route path="/tables" component={Tables} />
+            <Route path="/settings" component={Settings} />
+            <Route path="/profiles" component={Profiles} />
+            <Route path="/wall" component={Wall} />
+            <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..28185d3
--- /dev/null
+++ b/src/components/Charts.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Charts(props) {
+  return (
+    <div>
+      Check out my chart
+    </div>
+  );
+}
+
+export default Charts;
diff --git a/src/components/Marquee.js b/src/components/Marquee.js
index 820e8c4..1112af2 100644
--- a/src/components/Marquee.js
+++ b/src/components/Marquee.js
@@ -1,8 +1,8 @@
 import React from "react";
 
 function Marquee(props) {
-  const message = "hello";
-  return (   
+  const message = props.match.params.text;
+  return (
     <marquee>{message}</marquee>
   );
 }
diff --git a/src/components/Profile.js b/src/components/Profile.js
index c4eb646..f131ef2 100644
--- a/src/components/Profile.js
+++ b/src/components/Profile.js
@@ -2,9 +2,9 @@ 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 (   
+  return (
     <div>
       <h3>{user.firstName} {user.lastName}</h3>
       <h4>{user.occupation}</h4>
@@ -18,4 +18,3 @@ function Profile(props) {
 export default connect(function (state) {
   return {users: state.users};
 })(Profile);
-
diff --git a/src/components/Profiles.js b/src/components/Profiles.js
index 3409812..7db8892 100644
--- a/src/components/Profiles.js
+++ b/src/components/Profiles.js
@@ -1,15 +1,16 @@
 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 (   
+  return (
     <div>{userDivs}</div>
   );
 }
@@ -17,5 +18,3 @@ function Profiles(props) {
 export default connect(function (state) {
   return {users: state.users};
 })(Profiles);
-
-
diff --git a/src/components/Settings.js b/src/components/Settings.js
new file mode 100644
index 0000000..8d3a09e
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Settings(props) {
+  return (
+    <div>
+      Check out my settings!
+    </div>
+  );
+}
+
+export default Settings;
diff --git a/src/components/SideNav.js b/src/components/SideNav.js
index 9caaf7c..5e4c6f0 100644
--- a/src/components/SideNav.js
+++ b/src/components/SideNav.js
@@ -1,29 +1,58 @@
 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 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-gear" /> Settings
+          </Link>
+        </li>
+        <li>
+          <Link to={"/wall"}>
+            <i className="fa fa-fw fa-home" /> 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" /> Marquee "I love routes"
+          </Link>
+        </li>
+        <li>
+          <Link to={"/marquee/reactrouterrules"}>
+            <i className="fa fa-fw fa-heart" /> Marquee "React Router Rules"
+          </Link>
         </li>
       </ul>
-    </div>);  
+    </div>);
 }
 
 export default SideNav;
+
+// <a href="charts.html">
+//   <i className="fa fa-fw fa-bar-chart-o" /> Charts
+// </a>
diff --git a/src/components/Tables.js b/src/components/Tables.js
new file mode 100644
index 0000000..132365c
--- /dev/null
+++ b/src/components/Tables.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Tables(props) {
+  return (
+    <div>
+      Check out my table!
+    </div>
+  );
+}
+
+export default Tables;
diff --git a/src/components/Wall.js b/src/components/Wall.js
new file mode 100644
index 0000000..8cb7359
--- /dev/null
+++ b/src/components/Wall.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Wall(props) {
+  return (
+    <div>
+      Check out my wall!
+    </div>
+  );
+}
+
+export default Wall;