diff --git a/compforge/src/App.js b/compforge/src/App.js
index e0891dbee6e7ff7f9335ef03dbe02852c844385d..3acf5c836d391bee4c3395a1e64ba42e15200bd9 100644
--- a/compforge/src/App.js
+++ b/compforge/src/App.js
@@ -1,33 +1,50 @@
 import React from 'react';
 import './App.css';
 import firebase from './firebase'
-import SignedIn from './pages/SignedIn'
-import SignedOut from './pages/SignedOut'
-
-firebase.auth().onAuthStateChanged(function (user) {
-  if (user) {
-    var displayName = user.displayName;
-    var email = user.email;
-    var emailVerified = user.emailVerified;
-    var photoURL = user.photoURL;
-    var isAnonymous = user.isAnonymous;
-    var uid = user.uid;
-    var providerData = user.providerData;
-  }
-  else {
-    
-  }
-});
+import SignIn from './pages/SignIn'
+import SignUp from './pages/SignUp'
+import Dashboard from './pages/Dashboard';
+import CreateForm from './pages/CreateForm';
+import AddPartner from './pages/AddPartner';
+import PageNotFound from './pages/PageNotFound';
+import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
 
 function App() {
   var user = firebase.auth().currentUser;
-  return (
-    <div className="App">
-      <header className="App-header">
-        {user ? <SignedIn /> : <SignedOut />}
-      </header>
-    </div>
-  );
+  console.log(user);
+
+  firebase.auth().onAuthStateChanged(function (user) {
+    if (user) {
+      return (
+        <div className="App">
+          <header className="App-header">
+            <Router>
+              <Switch>
+                <Route exact path='/' component={Dashboard} />
+                <Route exact path='/CreateForm' component={CreateForm} />
+                <Route exact path='/AddPartner' component={AddPartner} />
+                <Route path='/' component={PageNotFound} />
+              </Switch>
+            </Router>
+          </header>
+        </div>
+      );
+    }
+    else {
+      return (
+        <div className="App">
+          <header className="App-header">
+            <Router>
+              <Switch>
+                <Route exact path="/signin" component={SignIn} />
+                <Route exact path='/signup' component={SignUp} />
+              </Switch>
+            </Router>
+          </header>
+        </div>
+      );
+    }
+  });
 }
 
 export default App;
\ No newline at end of file