diff --git a/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj b/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
index 6e5e0c5..4e9d7bb 100644
--- a/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
+++ b/TeamDBAwesome/TeamDBAwesome/TeamDBAwesome.csproj
@@ -213,16 +213,18 @@
     <Content Include="js\services\httpRequestInjector.js" />
     <Content Include="js\userController.js" />
     <Content Include="pages\admin-customerinfo.html" />
+    <Content Include="pages\admin-delete-playlist.html" />
     <Content Include="pages\admin-home.html" />
     <Content Include="pages\admin-mediacenter.html" />
     <Content Include="pages\admin-view.html" />
     <Content Include="index.html" />
+    <Content Include="pages\admin-edit-playlist.html" />
     <Content Include="pages\new-media.html" />
     <Content Include="pages\partial-adminlogin.html" />
     <Content Include="pages\partial-home.html" />
     <Content Include="pages\partial-login.html" />
     <Content Include="pages\partial-register.html" />
-    <Content Include="pages\playlist-editor.html" />
+    <Content Include="pages\admin-playlist-manager.html" />
     <Content Include="pages\templates\admin-header.html" />
     <Content Include="pages\templates\footer.html" />
     <Content Include="pages\templates\home-header.html" />
diff --git a/TeamDBAwesome/TeamDBAwesome/app.js b/TeamDBAwesome/TeamDBAwesome/app.js
index 40f97d7..380e665 100644
--- a/TeamDBAwesome/TeamDBAwesome/app.js
+++ b/TeamDBAwesome/TeamDBAwesome/app.js
@@ -111,11 +111,27 @@ app.config(function ($stateProvider, $urlRouterProvider, $httpProvider) {
                  'footer': { templateUrl: 'pages/templates/footer.html' }
              }
          })
-         .state('playlist-editor', {
+         .state('admin-playlist-manager', {
+             url: '/playlistmanager',
+             views: {
+                 'header': { templateUrl: 'pages/templates/admin-header.html' },
+                 'content': { templateUrl: 'pages/admin-playlist-manager.html' },
+                 'footer': { templateUrl: 'pages/templates/footer.html' }
+             }
+         })
+         .state('admin-edit-playlist', {
              url: '/playlisteditor',
              views: {
                  'header': { templateUrl: 'pages/templates/admin-header.html' },
-                 'content': { templateUrl: 'pages/playlist-editor.html' },
+                 'content': { templateUrl: 'pages/admin-edit-playlist.html' },
+                 'footer': { templateUrl: 'pages/templates/footer.html' }
+             }
+         })
+         .state('admin-delete-playlist', {
+             url: '/deleteplaylist',
+             views: {
+                 'header': { templateUrl: 'pages/templates/admin-header.html' },
+                 'content': { templateUrl: 'pages/admin-delete-playlist.html' },
                  'footer': { templateUrl: 'pages/templates/footer.html' }
              }
          })
diff --git a/TeamDBAwesome/TeamDBAwesome/js/adminController.js b/TeamDBAwesome/TeamDBAwesome/js/adminController.js
index 12a0b96..8471ad3 100644
--- a/TeamDBAwesome/TeamDBAwesome/js/adminController.js
+++ b/TeamDBAwesome/TeamDBAwesome/js/adminController.js
@@ -49,6 +49,39 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
         $scope.showMediaOptions = false;
     };
 
+    $scope.gridOptions = {
+        enableFiltering: true,
+    columnDefs: [
+        {field: 'Fname', displayName: 'First Name'},
+        {field: 'Lname', displayName: 'Last Name'},
+        {field: 'Address'},
+        {field: 'City'},
+        {field: 'State'},
+        {field: 'Post'},
+        {field: 'Country'},
+        {field: 'Phone'},
+        {field: 'Fax'},
+        {field: 'Email'},
+        {field: 'Company'}
+    ]
+    }
+
+    $scope.gridOptions.data = [
+        {
+            "Fname": "Test",
+            "Lname": "Test",
+            "Address": "Test",
+            "City": "Test",
+            "State": "Test",
+            "Post": "Test",
+            "Country": "Test",
+            "Phone": "Test",
+            "Fax": "Test",
+            "Email": "Test",
+            "Company": "Test"
+
+        }
+    ]
 
   
     $scope.getPlaylists = function () {
@@ -61,19 +94,4 @@ angular.module('routerApp').controller('adminController', function ($scope, $htt
         })
     }
 
-    $scope.playlists = [
-        {
-            "playlistId": "1",
-            "name": "test1"
-        },
-        {
-            "playlistId": "2",
-            "name": "test2"
-        },
-        {
-            "playlistId": "3",
-            "name": "test3"
-        }
-    ];
-
 });
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/admin-customerinfo.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-customerinfo.html
index 57903e8..6f268e7 100644
--- a/TeamDBAwesome/TeamDBAwesome/pages/admin-customerinfo.html
+++ b/TeamDBAwesome/TeamDBAwesome/pages/admin-customerinfo.html
@@ -1,16 +1,17 @@
 
 <div ng-controller="adminController">
 
-    <h2 class=''>Customer Info</h2><div>
+    <h2 class=''>Customer Info</h2>
+    <div>
 
-        <!-- <div id="messages" class="alert alert-info" data-ng-show="messages" data-ng-bind="messages"></div> -->
-        <!-- Generate a current list of questions w/ toggle disable -->
+        <!-- <div id="messages" class="alert alert-info" data-ng-show="messages" data-ng-bind="messages"></div>
+        Generate a current list of questions w/ toggle disable
         Review Customer Demographic Screen – this screen should be similar to the edit profile
         screen (see Figure 1 again) but it should include the ability to search for a customer by
         different means. This could include any of: First and Last Names, Company Name,
         Address/City/State/Country/Postal Code, Phone, Fax, and Email; whatever seems
-        appropriate.
-
+        appropriate. -->
+        <div id="customerDemograpics" ui-grid="gridOptions" class="grid"></div>
     </div>
 </div>
 <br><Br><br>
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/admin-delete-playlist.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-delete-playlist.html
new file mode 100644
index 0000000..2899fc1
--- /dev/null
+++ b/TeamDBAwesome/TeamDBAwesome/pages/admin-delete-playlist.html
@@ -0,0 +1,8 @@
+
+<head>
+    <title></title>
+	<meta charset="utf-8" />
+</head>
+<div ng-controller="adminController">
+
+</div>
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/admin-edit-playlist.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-edit-playlist.html
new file mode 100644
index 0000000..2899fc1
--- /dev/null
+++ b/TeamDBAwesome/TeamDBAwesome/pages/admin-edit-playlist.html
@@ -0,0 +1,8 @@
+
+<head>
+    <title></title>
+	<meta charset="utf-8" />
+</head>
+<div ng-controller="adminController">
+
+</div>
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/admin-mediacenter.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-mediacenter.html
index b4d0d25..a98b223 100644
--- a/TeamDBAwesome/TeamDBAwesome/pages/admin-mediacenter.html
+++ b/TeamDBAwesome/TeamDBAwesome/pages/admin-mediacenter.html
@@ -19,6 +19,6 @@
         criteria. <br /><br />-->
 
         <a ui-sref="new-media" class="btn btn-lg btn-primary center-block">Create New Media</a><br/>
-        <a ui-sref="playlist-editor" class="btn btn-lg btn-primary center-block">Playlist Editor</a>
+        <a ui-sref="admin-playlist-manager" class="btn btn-lg btn-primary center-block">Playlist Editor</a>
     </div>
 </div>
\ No newline at end of file
diff --git a/TeamDBAwesome/TeamDBAwesome/pages/playlist-editor.html b/TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html
similarity index 67%
rename from TeamDBAwesome/TeamDBAwesome/pages/playlist-editor.html
rename to TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html
index 2beb133..a22aa68 100644
--- a/TeamDBAwesome/TeamDBAwesome/pages/playlist-editor.html
+++ b/TeamDBAwesome/TeamDBAwesome/pages/admin-playlist-manager.html
@@ -3,13 +3,13 @@
     <meta charset="utf-8" />
 </head>
 <div ng-controller="adminController" ng-init="getPlaylists();">
-    <a ng-click="getPlaylists()">Create New Playlist</a>
+    <a>Create New Playlist</a>
     <table>
         <tr ng-repeat="playlist in playlists">
             <td>{{ playlist.PlaylistID }}</td>
             <td>{{ playlist.Name }}</td>
-            <td><button>Edit</button></td>
-            <td><button>Delete</button></td>
+            <td><a ui-sref="admin-edit-playlist">Edit</a></td>
+            <td><a ui-sref="admin-delete-playlist">Delete</a></td>
         </tr>
     </table>
 </div>