diff --git a/src/App.js b/src/App.js
index 15bddc9..aa0ab78 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 Dashboard from "./components/Dashboard";
+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 { 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"}}>
+            <div>
+              <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>
-    </div>
-
+    </BrowserRouter>
   );
 }
 
diff --git a/src/components/Charts.js b/src/components/Charts.js
new file mode 100644
index 0000000..69cf0df
--- /dev/null
+++ b/src/components/Charts.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Charts(props) {
+  return (
+    <div>
+      Charts
+    </div>
+  );
+}
+
+export default Charts;
\ 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/Profile.js b/src/components/Profile.js
index c4eb646..bdebdf3 100644
--- a/src/components/Profile.js
+++ b/src/components/Profile.js
@@ -2,8 +2,8 @@ import React from "react";
 import {connect} from "react-redux";
 
 function Profile(props) {
-  const userId = 0;
-  const user = props.users.find(u => u.id == userId) || {};
+  const userId = parseInt(props.match.params.id, 10);
+  const user = props.users.find(u => u.id === userId) || {};
   return (   
     <div>
       <h3>{user.firstName} {user.lastName}</h3>
diff --git a/src/components/Profiles.js b/src/components/Profiles.js
index 3409812..e69f169 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 { 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..a1260f1
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Settings(props) {
+  return (
+    <div>
+      Settings
+    </div>
+  );
+}
+
+export default Settings;
\ No newline at end of file
diff --git a/src/components/SideNav.js b/src/components/SideNav.js
index 9caaf7c..7c3fa8f 100644
--- a/src/components/SideNav.js
+++ b/src/components/SideNav.js
@@ -1,26 +1,49 @@
 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-cog" /> Settings
+          </Link>
+        </li>
+        <li>
+          <Link to="/wall">
+            <i className="fa fa-fw fa-newspaper-o" /> Wall
+          </Link>
+        </li>
+        <li>
+          <Link to="/profiles">
+            <i className="fa fa-fw fa-users" /> Profiles
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/FAQ">
+            <i className="fa fa-fw fa-question-circle" /> FAQ
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/twitter">
+            <i className="fa fa-fw fa-twitter" /> Twitter
+          </Link>
         </li>
       </ul>
     </div>);  
diff --git a/src/components/Tables.js b/src/components/Tables.js
new file mode 100644
index 0000000..140ba23
--- /dev/null
+++ b/src/components/Tables.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Tables(props) {
+  return (
+    <div>
+      Tables
+    </div>
+  );
+}
+
+export default Tables;
\ No newline at end of file
diff --git a/src/components/Wall.js b/src/components/Wall.js
new file mode 100644
index 0000000..b3f654b
--- /dev/null
+++ b/src/components/Wall.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Wall(props) {
+  return (
+    <div>
+      Wall
+    </div>
+  );
+}
+
+export default Wall;
\ No newline at end of file