diff --git a/src/App.js b/src/App.js
index 15bddc9..396bb3b 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,19 +1,39 @@
 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 */}
+    <div>
+      <BrowserRouter>
+        <div id="wrapper">
+          <nav className="navbar navbar-inverse navbar-fixed-top" role="navigation">
+            <TopNav />
+            <SideNav />
+          </nav>
+          <div style={{backgroundColor: "white"}}>
+            <Switch>
+              <Route path="/" component={Dashboard} />
+              <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} />
+            </Switch>
+          </div>
         </div>
-      </div>
+      </BrowserRouter>
     </div>
 
   );
diff --git a/src/components/Charts.js b/src/components/Charts.js
new file mode 100644
index 0000000..d523009
--- /dev/null
+++ b/src/components/Charts.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Charts() {
+  return (
+        <div>
+            Charts
+        </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..cc2f23f 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..bf2148b 100644
--- a/src/components/Profiles.js
+++ b/src/components/Profiles.js
@@ -1,4 +1,5 @@
 import React from "react";
+import {Link} from "react-router-dom";
 import {connect} from "react-redux";
 
 function Profiles(props) {
@@ -6,10 +7,10 @@ function Profiles(props) {
     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..12b9cf5
--- /dev/null
+++ b/src/components/Settings.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Settings() {
+  return (
+        <div>
+            Settings
+        </div>
+    );
+}
+
+export default Settings;
diff --git a/src/components/SideNav.js b/src/components/SideNav.js
index 9caaf7c..25ba6f0 100644
--- a/src/components/SideNav.js
+++ b/src/components/SideNav.js
@@ -1,29 +1,53 @@
 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 
+            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="/settings">
+            <i className="fa fa-fw fa-bar-chart-o" /> Settings
+          </Link>
+        </li>
+        <li>
+          <Link to="/wall">
+            <i className="fa fa-fw fa-table" /> Wall
+          </Link>
+        </li>
+        <li>
+          <Link to="/profiles">
+            <i className="fa fa-fw fa-bar-chart-o" /> Profiles
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/iloveroutes">
+            <i className="fa fa-fw fa-table" /> Marquee I love routes
+          </Link>
+        </li>
+        <li>
+          <Link to="/marquee/reactroutesrule">
+            <i className="fa fa-fw fa-table" /> Marquee React Routes Rule
+          </Link>
+          <Link to="/marquee/ilovetonyromo">
+            <i className="fa fa-fw fa-table" /> Marquee I LOVE TONY ROMO
+          </Link>
         </li>
       </ul>
-    </div>);  
+    </div>);
 }
 
 export default SideNav;
diff --git a/src/components/Tables.js b/src/components/Tables.js
new file mode 100644
index 0000000..40e391e
--- /dev/null
+++ b/src/components/Tables.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Tables() {
+  return (
+        <div>
+            Tables
+        </div>
+    );
+}
+
+export default Tables;
diff --git a/src/components/Wall.js b/src/components/Wall.js
new file mode 100644
index 0000000..9f89445
--- /dev/null
+++ b/src/components/Wall.js
@@ -0,0 +1,11 @@
+import React from "react";
+
+function Wall() {
+  return (
+        <div>
+            Wall
+        </div>
+    );
+}
+
+export default Wall;
diff --git a/src/components/index.html b/src/components/index.html
new file mode 100644
index 0000000..7b2848a
--- /dev/null
+++ b/src/components/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Battleship React</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.6/css/bootstrap.min.css">
+    <link rel="stylesheet" href="style2.css" />
+  </head>
+  <body>
+    <div id="react">
+
+    </div>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/babel-standalone/6.23.1/babel.min.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/15.5.0/react.js"></script>
+    <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/15.5.0/react-dom.js"></script>
+    <script type="text/babel" src="./script2.js"></script>
+  </body>
+  <!-- <footer>
+    <button type="button" name="random">random</button>
+  </footer> -->
+</html>