diff --git a/config.js b/config.js
index aa8f619..f38884f 100644
--- a/config.js
+++ b/config.js
@@ -12,6 +12,7 @@ angular.module('flashy', [
     'flashy.ResetPasswordController',
     'flashy.VerifyEmailController',
     'flashy.CardListController',
+	'flashy.SettingsController',
     'ngCookies']).
     config(function($stateProvider, $urlRouterProvider, $resourceProvider, $httpProvider, $locationProvider) {
         'use strict';
@@ -111,6 +112,12 @@ angular.module('flashy', [
                 templateUrl: 'templates/flashcard.html',
                 controller: 'FlashcardController'
             }).
+			state('settings', {
+				resolve: auth_resolve,
+				url: '/settings',
+				templateUrl: 'templates/settings.html',
+				controller: 'SettingsController'
+			}).
             state('requestpasswordreset', {
                 url: '/requestpasswordreset',
                 templateUrl: 'templates/requestpasswordreset.html',
diff --git a/home.html b/home.html
index 1a4eb4b..f344bdc 100644
--- a/home.html
+++ b/home.html
@@ -146,6 +146,7 @@
 <!-- Controllers -->
 <script src="scripts/FeedController.js"></script>
 <script src="scripts/RootController.js"></script>
+<script src="scripts/SettingsController.js"></script>
 <script src="scripts/LoginController.js"></script>
 <script src="scripts/LogoutController.js"></script>
 <script src="scripts/DeckController.js"></script>
diff --git a/scripts/SettingsController.js b/scripts/SettingsController.js
new file mode 100644
index 0000000..e9d0144
--- /dev/null
+++ b/scripts/SettingsController.js
@@ -0,0 +1,13 @@
+angular.module('flashy.SettingsController', ['ui.router']).
+
+	controller('SettingsController', function($scope) {
+		
+		
+		$scope.changePassword = function(oldPassword, newPassword, confirmedNewPassword) {
+			
+			
+			
+			
+		}
+		
+	});
\ No newline at end of file
diff --git a/styles/flashy.css b/styles/flashy.css
index 0fec607..ff41a08 100644
--- a/styles/flashy.css
+++ b/styles/flashy.css
@@ -396,6 +396,20 @@ margin: 0;
 }
 
 
+#resetPasswordForm{
+	display: block;
+	margin-left: auto;
+	margin-right: auto;
+	width: 500px;
+}
+
+#resetPWButton{
+	margin-left: auto;
+	margin-right: auto;
+	display: block;
+	width: 200px;
+}
+
 
 
 
diff --git a/templates/settings.html b/templates/settings.html
new file mode 100644
index 0000000..afd9b8b
--- /dev/null
+++ b/templates/settings.html
@@ -0,0 +1,38 @@
+<div class="card" id="resetPasswordForm">
+
+	<h2>Change Password</h2>
+
+	<div class="row">
+		<form class="col s12">
+
+
+		  <div class="row">
+			<div class="input-field col s12">
+			  <input id="password" type="password" ng-model="oldPassword" class="validate">
+			  <label for="password">Old Password</label>
+			</div>
+		  </div>
+		  
+		  <div class="row">
+			<div class="input-field col s12">
+			  <input id="password" type="password" ng-model="newPassword" class="validate">
+			  <label for="password">New Password</label>
+			</div>
+		  </div>
+		  
+		  <div class="row">
+			<div class="input-field col s12">
+			  <input id="password" type="password" ng-model="confirmedNewPassword" class="validate">
+			  <label for="password">Confirm New Password</label>
+			</div>
+		  </div>
+		 
+		 
+		</form>
+		
+		<a class="waves-effect waves-light btn" id="resetPWButton" ng-click="changePassword(oldPassword, newPassword, confirmedNewPassword)">Reset Password</a>
+		
+	</div>
+</div>
+
+