diff --git a/config.js b/config.js
index 5b0c188..4388e21 100644
--- a/config.js
+++ b/config.js
@@ -6,7 +6,9 @@ angular.module('flashy', [
     'flashy.DeckController',
     'flashy.ClassAddController',
     'flashy.RequestResetController',
+    'flashy.ReviewController',
     'flashy.UserService',
+    'flashy.FlashcardDirective',
     'ngCookies']).
     config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
         '$locationProvider',
@@ -48,6 +50,16 @@ angular.module('flashy', [
                     templateUrl: 'templates/deck.html',
                     controller: 'DeckController'
                 }).
+                state('review', {
+                    url: '/review',
+                    templateUrl: 'templates/review.html',
+                    controller: 'ReviewController'
+                }).
+                state('flashcard', {
+                    url: '/flashcard',
+                    templateUrl: 'templates/flashcard.html',
+                    controller: 'FlashcardController'
+                }).
                 state('requestpasswordreset', {
                     url: '/requestpasswordreset',
                     templateUrl: 'templates/requestpasswordreset.html',
diff --git a/home.html b/home.html
index ce211b6..1f320a2 100644
--- a/home.html
+++ b/home.html
@@ -22,6 +22,7 @@
 
 <script src="config.js"></script>
 
+<!-- Controllers -->
 <script src="scripts/FeedController.js"></script>
 <script src="scripts/RootController.js"></script>
 <script src="scripts/LoginController.js"></script>
@@ -29,7 +30,15 @@
 <script src="scripts/DeckController.js"></script>
 <script src="scripts/RequestResetController.js"></script>
 <script src="scripts/ClassAddController.js"></script>
+<script src="scripts/ReviewController.js"></script>
+
+<!-- Services -->
 <script src="scripts/UserService.js"></script>
+
+<!-- Directives -->
+<script src="scripts/FlashcardDirective.js"></script>
+
+<!-- Other -->
 <script src="//ghiden.github.io/angucomplete-alt/js/libs/angucomplete-alt.js"></script>
 <!--<script src="scripts/bootstrap.js"></script>-->
 
diff --git a/scripts/FlashcardDirective.js b/scripts/FlashcardDirective.js
new file mode 100644
index 0000000..c69effd
--- /dev/null
+++ b/scripts/FlashcardDirective.js
@@ -0,0 +1,11 @@
+angular.module('flashy.FlashcardDirective', []).
+
+directive('flashcard', function() {
+    return {
+        templateUrl: '/app/templates/flashcard.html',
+        restrict: 'E',
+        link: function() {
+            console.log("HELLO FROM FLASHCARD DIRECTIVE");
+        }
+    };
+});
diff --git a/scripts/ReviewController.js b/scripts/ReviewController.js
new file mode 100644
index 0000000..76013d5
--- /dev/null
+++ b/scripts/ReviewController.js
@@ -0,0 +1,7 @@
+angular.module('flashy.ReviewController', ['ui.router']).
+
+controller('ReviewController', ['$scope', '$state',
+    function($scope, $state) {
+        console.log("hello from review controller");
+    }
+]);
diff --git a/templates/flashcard.html b/templates/flashcard.html
new file mode 100644
index 0000000..f4c8bde
--- /dev/null
+++ b/templates/flashcard.html
@@ -0,0 +1,17 @@
+<div class="row">
+  <div class="col s12 m6">
+    <div class="card">
+      <div class="card-image">
+        <img src="images/sample-1.jpg">
+        <span class="card-title">Card Title</span>
+      </div>
+      <div class="card-content">
+      <p>{{htmlContent}}</p>
+      </div>
+      <div class="card-action">
+        <a href="#">This is a link</a>
+        <a href='#'>This is a link</a>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/templates/login.html b/templates/login.html
index 4522fc3..de27939 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -25,4 +25,4 @@
     </form>
     <a class="trigger-password-reset" ng-click="triggerPasswordReset()" href="#">Forgot Password?</a>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/review.html b/templates/review.html
new file mode 100644
index 0000000..33a710d
--- /dev/null
+++ b/templates/review.html
@@ -0,0 +1,9 @@
+<div class="container">
+  Hello<br>
+  1. Get card from server.<br>
+  2. Show card<br>
+  3. Inputs<br>
+  4. Compare answers<br>
+  5. User decides for correct/incorrect<br>
+  <flashcard>Hello</flashcard>
+</div>