diff --git a/frontend/app/js/app.js b/frontend/app/js/app.js
index 899b26e..62abfd5 100644
--- a/frontend/app/js/app.js
+++ b/frontend/app/js/app.js
@@ -1 +1,10 @@
-var app = angular.module("wrestlingdev", []);
\ No newline at end of file
+var app =  angular.module("wrestlingdev", ["ngRoute"]).run(function($rootScope) {
+  // adds some basic utilities to the $rootScope for debugging purposes
+  $rootScope.log = function(thing) {
+    console.log(thing);
+  };
+
+  $rootScope.alert = function(thing) {
+    alert(thing);
+  };
+});
\ No newline at end of file
diff --git a/frontend/app/js/routes.js b/frontend/app/js/routes.js
new file mode 100644
index 0000000..1b2f71b
--- /dev/null
+++ b/frontend/app/js/routes.js
@@ -0,0 +1,30 @@
+
+  
+//   $routeProvider.when('/list-of-books', {
+//     templateUrl: 'angular/books.html',
+//     controller: 'BooksController'
+//     // uncomment if you want to see an example of a route that resolves a request prior to rendering
+//     // resolve: {
+//     //   books : function(BookService) {
+//     //     return BookService.get();
+//     //   }
+//     // }
+//   });
+
+
+
+app.config(['$routeProvider',
+  function($routeProvider) {
+    $routeProvider.
+      when('/tournaments', {
+        templateUrl: 'tournaments.html',
+        controller: 'tournamentsController'
+      }).
+    //   when('/phones/:phoneId', {
+    //     templateUrl: 'partials/phone-detail.html',
+    //     controller: 'PhoneDetailCtrl'
+    //   }).
+      otherwise({
+        redirectTo: '/tournaments'
+      });
+  }]);
\ No newline at end of file
diff --git a/frontend/app/pages/index.us b/frontend/app/pages/index.us
index 23a13d6..0e2a372 100644
--- a/frontend/app/pages/index.us
+++ b/frontend/app/pages/index.us
@@ -34,35 +34,8 @@
                         <div class="col-md-2">
               			      <!--leftsidebar-->
               		      </div>
-                        <div class="col-md-8" style="padding-left: 2%;">
-                            <div class="container" ui-view="main" ng-controller="tournamentsController">
-                              <h2>Upcoming Tournaments</h2>
-                              <br>
-                              <form ng-submit="searchTournaments()">
-                                <div class="input-group">
-                                  <input type="text" class="form-control" placeholder="Search by name or date YYYY-MM-DD" ng-model="searchTerms">
-                                  <span class="input-group-btn">
-                                    <button class="btn btn-default" type="submit" id="submit">Search</button>
-                                  </span>
-                                </div>
-                              </form>
-                              <br>
-                              <table class="table">
-                                <thead class="font-spot-color">
-                                  <tr>
-                                    <th>Name</th>
-                                    <th>Date</th>
-                                  </tr>
-                                </thead>
-                                <tbody>
-                                  <tr ng-repeat="tournament in allTournaments">
-                                      <td>{{ tournament.name }}</td>
-                                      <td>{{ tournament.date }}</td>
-                                  </tr>
-                                </tbody>
-                              </table>
-                            </div>
-                        </div>
+                        <!--content-->
+                        <div id="view" ng-view></div>
             		      <div class="col-md-2" >
             			      <!--rightsidebar-->
             		      </div>
diff --git a/frontend/app/templates/tournaments.html b/frontend/app/templates/tournaments.html
new file mode 100644
index 0000000..d8fab1f
--- /dev/null
+++ b/frontend/app/templates/tournaments.html
@@ -0,0 +1,29 @@
+<div class="col-md-8" style="padding-left: 2%;">
+                            <div class="container" ui-view="main" ng-controller="tournamentsController">
+                              <h2>Upcoming Tournaments</h2>
+                              <br>
+                              <form ng-submit="searchTournaments()">
+                                <div class="input-group">
+                                  <input type="text" class="form-control" placeholder="Search by name or date YYYY-MM-DD" ng-model="searchTerms">
+                                  <span class="input-group-btn">
+                                    <button class="btn btn-default" type="submit" id="submit">Search</button>
+                                  </span>
+                                </div>
+                              </form>
+                              <br>
+                              <table class="table">
+                                <thead class="font-spot-color">
+                                  <tr>
+                                    <th>Name</th>
+                                    <th>Date</th>
+                                  </tr>
+                                </thead>
+                                <tbody>
+                                  <tr ng-repeat="tournament in allTournaments">
+                                      <td>{{ tournament.name }}</td>
+                                      <td>{{ tournament.date }}</td>
+                                  </tr>
+                                </tbody>
+                              </table>
+                            </div>
+                        </div>
\ No newline at end of file
diff --git a/frontend/config/application.js b/frontend/config/application.js
index 6a7ddf8..88b807f 100644
--- a/frontend/config/application.js
+++ b/frontend/config/application.js
@@ -26,7 +26,8 @@ module.exports = function(lineman) {
       apiProxy: {
         enabled: true,
         host: 'localhost',
-        port: 8080
+        port: 8080,
+        prefix: 'api'
       },
       web: {
         port: 8081