diff --git a/WebContent/html/imgs/cat.png b/WebContent/html/imgs/cat.png
deleted file mode 100644
index 23058ae..0000000
Binary files a/WebContent/html/imgs/cat.png and /dev/null differ
diff --git a/WebContent/html/imgs/cat_admin.png b/WebContent/html/imgs/cat_admin.png
deleted file mode 100644
index f0bca6b..0000000
Binary files a/WebContent/html/imgs/cat_admin.png and /dev/null differ
diff --git a/WebContent/html/imgs/potato.png b/WebContent/html/imgs/potato.png
deleted file mode 100644
index d98bd68..0000000
Binary files a/WebContent/html/imgs/potato.png and /dev/null differ
diff --git a/WebContent/html/imgs/synchrony logo.png b/WebContent/html/imgs/synchrony logo.png
new file mode 100644
index 0000000..0751a83
Binary files /dev/null and b/WebContent/html/imgs/synchrony logo.png differ
diff --git a/WebContent/html/imgs/user_icon.png b/WebContent/html/imgs/user_icon.png
deleted file mode 100644
index feff4b3..0000000
Binary files a/WebContent/html/imgs/user_icon.png and /dev/null differ
diff --git a/WebContent/html/javascript/request.jsp b/WebContent/html/javascript/request.jsp
index 6e050fe..78a1ce9 100644
--- a/WebContent/html/javascript/request.jsp
+++ b/WebContent/html/javascript/request.jsp
@@ -41,7 +41,7 @@ function show(deviceArray){
 	var part1 = "nhpup.popup('";
     var part2 = "');"
 	for (var i = 0; i < deviceArray.length; i++) {
-		html += '<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" onerror="this.src=\'../imgs/synchrony-financial-logo-dlpx_1.png\';" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><button class = "requestbutton" id = "button' + (deviceArray[i].id) + '" type="button">Order device</button></div></div></a><br><br>'
+		html += '<a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + deviceArray[i].hardware + '<br><br>' + 'Manufacturer: ' + deviceArray[i].manufacturer + part2 + '"><div class = "deviceContainer"><div class = "imgContainer"><img src="../imgs/my-icons-collection-devices/png/' + deviceArray[i].hardware + '.png" onerror="this.src=\'../imgs/synchrony logo.png\';" class = "device">' + deviceArray[i].name + '</div><div class = "deviceDescp"><p>' + deviceArray[i].description + '</p><button class = "requestbutton" id = "button' + (deviceArray[i].id) + '" type="button">Order device</button></div></div></a><br><br>'
 	}
 	
 	if(html.localeCompare("")==0)
diff --git a/WebContent/html/webpages/administration/adminApprove.jsp b/WebContent/html/webpages/administration/adminApprove.jsp
index e08853e..af64ee3 100644
--- a/WebContent/html/webpages/administration/adminApprove.jsp
+++ b/WebContent/html/webpages/administration/adminApprove.jsp
@@ -14,48 +14,11 @@ pageEncoding="ISO-8859-1"%>
     <title>Innovation Hub</title>
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
     <link rel = "shortcut icon" href = "../../imgs/synchrony-financial-logo-dlpx_1.ico">
     <style>
-    div.deviceContainer{
-      border: solid; 
-      border-width: thin; 
-      padding: 15px;
-      background-color: #E9EAEB;
-      display: inline-block;
-    }
-    div.imgContainer{
-      display: inline-block; 
-      text-align: center;
-    }
-    img.device{
-      display: block;
-    }
-    div.deviceDescp{
-      display: inline-block; 
-      width: 200px; 
-      text-align: center; 
-    }
-    button.approvebutton{
-      display: block; 
-      margin: auto;
-    }
-    div.approveConfirm{
-      display: none;
-      top: 50%;
-      left: 50%;
-      position: fixed;
-      width: 155px;
-      height: 85px;
-      line-height: 85px;
-      text-align: center;
-      background-color: #FBC600;
-      border: solid;
-      border-color: #3B3C43;
-      border-radius: 5px;
-    }
     .form-control{
       margin: auto;
       text-align: center;
@@ -148,147 +111,204 @@ pageEncoding="ISO-8859-1"%>
 	  </div>
 
 <%
-Ticket[] tickets  = TicketQueries.getTickets();  
+/*
+	Get all tickets that need to be reviewed for approval from the server.
+*/
+Ticket[] tickets  = TicketQueries.getRequestedTickets();  
 String ticketStr = Ticket.arrayToString(tickets);
 %>
 
 <script>
+  /*
+  	Turn tickets into strings that can be displayable in the ticket hub menu.
+  */
   window.json = '<%=ticketStr%>';
   var ticks = JSON.parse(window.json);
 
+  /*
+  	This displays the tickets.
+  */
   populateTickets(ticks);
 
-		//adds event listeners to all table records
-		$("tr.entry").click(ticketAction);
-		//Exits modal when x is clicked.
-		$("#closeForm").click(closeModal);
-		//Event listener exits modal when esc key pressed.
-		window.onkeydown = function(e){if (e.keyCode == 27){closeModal();}}
-		//Event listener exits modal when click outside modal.
-		window.onclick = function(e){var modal = document.getElementById('Modal'); if(e.target == modal) {closeModal();}}
-    // search bar listener
-    var searchbar = document.getElementsByName('searchBar');
-    searchbar[0].onkeyup = refresh;
-    function refresh() {
-      populateTickets(fuzzyFilter(JSON.parse(window.json)));
-      //adds event listeners to all table records
-      $("tr.entry").click(ticketAction);
-    }
+  /*
+  	Managing the event listeners on the page.
+  */
+  // Adds event listeners to all table records, so you can approve/reject it.
+  $("tr.entry").click(ticketAction);
+  
+  // Exits modal when x is clicked.
+  $("#closeForm").click(closeModal);
+  // Event listener exits modal when esc key pressed.
+  window.onkeydown = function(e){if (e.keyCode == 27){closeModal();}}
+  // Event listener exits modal when click outside modal.
+  window.onclick = function(e){var modal = document.getElementById('Modal'); if(e.target == modal) {closeModal();}}
+  
+  // Search bar listener
+  var searchbar = document.getElementsByName('searchBar');
+  searchbar[0].onkeyup = refresh;
 
-		//Places all tickets from query into page
-		function populateTickets(tickets){
+  /*
+  	Params: tickets - array of objects, formatted as tickets.
+  	This function will display tickets in a table on the webpage.
+  */
+  function populateTickets(tickets){
       var html = "";
       for(var i = 0; i < tickets.length; i++){
-		    //NEED TO ADD IN RETURN DATE AT END BUT THAT WOULD BREAK THINGS AT THE MOMENT
+      		// Iteratively, a string of HTML tags is built that will later be placed
+      		// inside of a table block, formatted in a way so all the proper information
+      		// is displayed.
+		    // TODO : NEED TO ADD IN RETURN DATE AT END BUT THAT WOULD BREAK THINGS AT THE MOMENT
 		    html += "<tr class = 'entry' id = '" + i + "'><td>" + tickets[i].id + "</td><td>" + tickets[i].username + "</td><td>" + tickets[i].locationname + "</td><td>" + tickets[i].devicename + "</td><td>" + tickets[i].status + "</td><td>" + tickets[i].permanent + "</td><td>" + tickets[i].return + "</td></tr>";
 		  }
 		  document.getElementById("tablebodymain").innerHTML = html;
-		}
-		
-		function ticketAction(){
-			var id = this.id;
-		    var html = "<tr><td>" + ticks[id].id + "</td><td>" + ticks[id].username + "</td><td>" + ticks[id].locationname + "</td><td>" + ticks[id].devicename + "</td><td>" + ticks[id].status + "</td><td>" + ticks[id].permanent + "</td><td>" + ticks[id].return + "</td></tr>";
-		    document.getElementById("tablemodal").innerHTML = html;
-		    $("#ticketIDfield").val(ticks[id].id);
-		    $("#deviceIDfield").val(ticks[id].deviceID);
-		    $("#locationIDfield").val(ticks[id].location);
-		    $("#permField").val(ticks[id].permanent);
-		    $("#Modal").show();
-		}
+  }
 		
-		function closeModal(){
-		  $("#Modal").hide();
-		}
-	    function fuzzyFilter(ticketArray) {
-	      // First pass: filter by id
-	      var searchText = document.getElementsByName('searchBar')[0].value;
-	      var options = {
-	        pre: "<span style='color: darkmagenta; font-size: 115%'><b>",
-	        post: '</b></span>',
-	        extract: function(arg) {return ''+arg.id;}
-	      }
-	      var idFilterResults = fuzzy.filter(searchText, ticketArray, options);
-	      for (var i = idFilterResults.length - 1; i >= 0; i--) {
-	        idFilterResults[i].original.id=idFilterResults[i].string;
-	      }
-	      // Pass #2: filter by status
-	      options.extract=function(arg) {return arg.status;}
-	      var statusFilterResults = fuzzy.filter(searchText, ticketArray, options)
-	      for (var i = statusFilterResults.length-1;i >=0; i--) {
-	        statusFilterResults[i].original.status=statusFilterResults[i].string;
-	      }
-	      // Pass #3: filter by username
-	      options.extract=function(arg) {return arg.username;}
-	      var usernameFilterResults = fuzzy.filter(searchText, ticketArray, options)
-	      for (var i = usernameFilterResults.length-1;i >=0; i--) {
-	        usernameFilterResults[i].original.username=usernameFilterResults[i].string;
-	      }
-	      // Pass #4: filter by locationname
-	      options.extract=function(arg) {return arg.locationname;}
-	      var locationnameFilterResults = fuzzy.filter(searchText, ticketArray, options)
-	      for (var i = locationnameFilterResults.length-1;i >=0; i--) {
-	        locationnameFilterResults[i].original.locationname=locationnameFilterResults[i].string;
-	      }
-	      // Pass #5: filter by devicename
-	      options.extract=function(arg) {return arg.devicename;}
-	      var devicenameFilterResults = fuzzy.filter(searchText, ticketArray, options)
-	      for (var i = devicenameFilterResults.length-1;i >=0; i--) {
-	        devicenameFilterResults[i].original.devicename=devicenameFilterResults[i].string;
-	      }
-	      // Pass #6: filter by return
-	      options.extract=function(arg) {return arg.return;}
-	      var returnFilterResults = fuzzy.filter(searchText, ticketArray, options)
-	      for (var i = returnFilterResults.length-1;i >=0; i--) {
-	        returnFilterResults[i].original.return=returnFilterResults[i].string;
-	      }
+  /*
+  	This function is executed by the ticket record event listener.
+  	When a ticket record is selected, we want a modal to display and autofill
+  	with information pertaining to the ticket that should be reviewed.
+  	From there, the ticket can be approved or rejected from the modal.
+  */
+  function ticketAction(){
+	  var id = this.id;
+	  var html = "<tr><td>" + ticks[id].id + "</td><td>" + ticks[id].username + "</td><td>" + ticks[id].locationname + "</td><td>" + ticks[id].devicename + "</td><td>" + ticks[id].status + "</td><td>" + ticks[id].permanent + "</td><td>" + ticks[id].return + "</td></tr>";
+	  document.getElementById("tablemodal").innerHTML = html;
+	  $("#ticketIDfield").val(ticks[id].id);
+	  $("#deviceIDfield").val(ticks[id].deviceID);
+	  $("#locationIDfield").val(ticks[id].location);
+	  $("#permField").val(ticks[id].permanent);
+	  $("#Modal").show();
+  }
 	
-	      var filteredResults = union([idFilterResults, statusFilterResults, usernameFilterResults, locationnameFilterResults, devicenameFilterResults, returnFilterResults]);
+  /*
+  	This function is executed when a user is attempting to close out
+  	the modal, whether that is clicking x, clicking outside of the modal,
+  	or clicking esc.
+  */	
+  function closeModal(){
+	  $("#Modal").hide();
+  }
+  
+  /*
+  	This function "refreshes" the page while search query is performed.
+  	It essentially filters the tickets based on search criteria, 
+  	and redisplays them, while adding back their event listeners.
+  */
+  function refresh() {
+    populateTickets(fuzzyFilter(JSON.parse(window.json)));
+    //adds event listeners to all table records
+    $("tr.entry").click(ticketAction);
+  }
+  
+  /*
+  	Params: ticketArray - Array of objects, formatted as tickets.
+  	Output: finalResults - Array of objects, formatted as tickets, but filtered by search text.
+  	This function is executed on the search bar's key-up event listener, and based on the input text,
+  	will filter what is currently displayed in the table based on user input. It implements a scoring system
+  	that determines how "matching" a table string is to the user input.
+  */
+  function fuzzyFilter(ticketArray) {
+      // Pass #1: filter by id
+      var searchText = document.getElementsByName('searchBar')[0].value;
+      var options = {
+        pre: "<span style='color: darkmagenta; font-size: 115%'><b>",
+        post: '</b></span>',
+        extract: function(arg) {return ''+arg.id;}
+      }
+      var idFilterResults = fuzzy.filter(searchText, ticketArray, options);
+      for (var i = idFilterResults.length - 1; i >= 0; i--) {
+        idFilterResults[i].original.id=idFilterResults[i].string;
+      }
+      // Pass #2: filter by status
+      options.extract=function(arg) {return arg.status;}
+      var statusFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = statusFilterResults.length-1;i >=0; i--) {
+        statusFilterResults[i].original.status=statusFilterResults[i].string;
+      }
+      // Pass #3: filter by username
+      options.extract=function(arg) {return arg.username;}
+      var usernameFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = usernameFilterResults.length-1;i >=0; i--) {
+        usernameFilterResults[i].original.username=usernameFilterResults[i].string;
+      }
+      // Pass #4: filter by locationname
+      options.extract=function(arg) {return arg.locationname;}
+      var locationnameFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = locationnameFilterResults.length-1;i >=0; i--) {
+        locationnameFilterResults[i].original.locationname=locationnameFilterResults[i].string;
+      }
+      // Pass #5: filter by devicename
+      options.extract=function(arg) {return arg.devicename;}
+      var devicenameFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = devicenameFilterResults.length-1;i >=0; i--) {
+        devicenameFilterResults[i].original.devicename=devicenameFilterResults[i].string;
+      }
+      // Pass #6: filter by return
+      options.extract=function(arg) {return arg.return;}
+      var returnFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = returnFilterResults.length-1;i >=0; i--) {
+        returnFilterResults[i].original.return=returnFilterResults[i].string;
+      }
+
+      var filteredResults = union([idFilterResults, statusFilterResults, usernameFilterResults, locationnameFilterResults, devicenameFilterResults, returnFilterResults]);
+
+	  // this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string'
+	  // I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,
+	  // and the 'string' attribute, which is the attribute that was compared against with matching characters conveniantly bolded
+	  var finalResults = new Array(filteredResults.length);
 	
-		  // this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string'
-		  // I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,
-		  // and the 'string' attribute, which is the attribute that was compared against with matching characters conveniantly bolded
-		  var finalResults = new Array(filteredResults.length);
-		
-		  for (var i = 0; i < finalResults.length; i++) {
-		    finalResults[i]= {
-		      id:filteredResults[i].original.id,
-		      status:filteredResults[i].original.status,
-		      username:filteredResults[i].original.username,
-		      locationname:filteredResults[i].original.locationname,
-		      devicename:filteredResults[i].original.devicename,
-		      return:filteredResults[i].original.return,
-		      permanent:filteredResults[i].original.permanent,
-		    };
-		  }
-		
-		  return finalResults;
-		}
-	function union(arrays) {
-	  if(arrays.length == 2) 
-	    return(unionBaseCase(arrays[0],arrays[1]))
-	  if(arrays.length == 1)
-	    return(arrays[0])
-	  else{
-	    var pivot = Math.floor(arrays.length/2);
-	    var arrayA=arrays.slice(0,pivot);
-	    var arrayB=arrays.slice(pivot);
-	    return union([union(arrayA),union(arrayB)]);
+	  for (var i = 0; i < finalResults.length; i++) {
+	    finalResults[i]= {
+	      id:filteredResults[i].original.id,
+	      status:filteredResults[i].original.status,
+	      username:filteredResults[i].original.username,
+	      locationname:filteredResults[i].original.locationname,
+	      devicename:filteredResults[i].original.devicename,
+	      return:filteredResults[i].original.return,
+	      permanent:filteredResults[i].original.permanent,
+	    };
 	  }
-	}
+		
+	  return finalResults;
+  }
+	
+  /*
+  	Params: arrays - a set of arrays that will be unioned together.
+  	Output: One array, union of the input
+  	Unions array results and removes duplicates. This is needed to support
+  	fuzzy filter search.
+  */
+  function union(arrays) {
+    if(arrays.length == 2) 
+      return(unionBaseCase(arrays[0],arrays[1]))
+    if(arrays.length == 1)
+      return(arrays[0])
+    else{
+      var pivot = Math.floor(arrays.length/2);
+      var arrayA=arrays.slice(0,pivot);
+      var arrayB=arrays.slice(pivot);
+      return union([union(arrayA),union(arrayB)]);
+    }
+  }
 
-function unionBaseCase(array1,array2) {
-  var results = new Array();
-  while(array1.length>0 && array2.length>0) {
-    if(array1[0].index == array2[0].index){
-      array1.splice(0,1);
+  /*
+  	Params: array1 - first array we are unioning, array2 - second array we are unioning
+  	Output: results - One array, the union of the two inputs.
+  	This is where tha magic happens and the actual union occurs between two arrays.
+  */
+  function unionBaseCase(array1,array2) {
+    var results = new Array();
+    while(array1.length>0 && array2.length>0) {
+      if(array1[0].index == array2[0].index){
+        array1.splice(0,1);
+      }
+      else
+        results.push((array1[0].index > array2[0].index ? array2.splice(0,1)[0] : array1.splice(0,1)[0]))
     }
-    else
-      results.push((array1[0].index > array2[0].index ? array2.splice(0,1)[0] : array1.splice(0,1)[0]))
+    results = results.concat(array1);
+    results = results.concat(array2);
+    return results;
   }
-  results = results.concat(array1);
-  results = results.concat(array2);
-  return results;
-}
 </script>
 <script src="../../javascript/lib/fuzzy.js"></script>
 </body>
diff --git a/WebContent/html/webpages/administration/adminpasswordsetting.jsp b/WebContent/html/webpages/administration/adminpasswordsetting.jsp
index 0359bc0..332a828 100644
--- a/WebContent/html/webpages/administration/adminpasswordsetting.jsp
+++ b/WebContent/html/webpages/administration/adminpasswordsetting.jsp
@@ -10,9 +10,9 @@
     <title>Innovation Hub</title>
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
     <link rel = "shortcut icon" href = "../../imgs/synchrony-financial-logo-dlpx_1.ico">
     <style>
     input.form-control{
diff --git a/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp b/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp
index f006479..306e39b 100644
--- a/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp
+++ b/WebContent/html/webpages/administration/adminpasswordsettingtryagain.jsp
@@ -10,9 +10,9 @@
     <title>Innovation Hub</title>
 
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">    
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
     <link rel = "shortcut icon" href = "../../imgs/synchrony-financial-logo-dlpx_1.ico">
     <style>
     input.form-control{
diff --git a/WebContent/html/webpages/administration/allTickets.jsp b/WebContent/html/webpages/administration/allTickets.jsp
new file mode 100644
index 0000000..339bfb0
--- /dev/null
+++ b/WebContent/html/webpages/administration/allTickets.jsp
@@ -0,0 +1,256 @@
+<%@ page import = "database.*,entities.*" %>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+
+    <title>Innovation Hub</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
+    <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.11.1/bootstrap-table.min.css">
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.11.1/bootstrap-table.min.js"></script>
+    <!-- Latest compiled and minified Locales -->
+    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-table/1.11.1/locale/bootstrap-table-zh-CN.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <link rel = "shortcut icon" href = "../../imgs/synchrony-financial-logo-dlpx_1.ico">
+    <style>
+    .form-control{
+      margin: auto;
+      text-align: center;
+    }
+
+    tr.entry{
+      cursor: pointer;
+    }
+
+    .table{
+      width: auto;
+      background-color: #E9EAEB;
+    }
+
+    tbody{
+      text-align: left;
+    }
+	
+	.btn{
+		margin-top: 15px;
+	}
+	
+	body{
+      overflow: visible;
+    }
+    </style>
+  </head>
+
+  <body>
+    <!-- Navbar. -->
+    <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">  
+    	<%@ include file="../components/adminnavbar.jsp"%>
+    </nav>
+
+	<!-- Admin sidebar. -->
+	<div class="col-sm-3 col-md-2 sidebar">
+		<%@ include file="../components/adminsidebar.jsp" %>
+	</div>
+
+	<!-- Main body, where data is displayed. -->
+    <div class = "displayDevice">
+      <h2>All Tickets</h2>
+      <!-- Search Bar -->
+  	  <form onsubmit="return false;" class="form-inline">
+    	<input type="search" class="form-control" name="searchBar" placeholder=" search tickets" autocomplete="off" style="width: 50%; text-align: left; margin: 1%;"  />
+      </form> 
+	  <table class="table table-bordered table-hover" data-toggle="table" data-sort-name="id" data-sort-order="asc">
+        <thead>
+            <tr>
+                <th data-name = "id" data-sortable = "true">Ticket ID</th>
+                <th data-name = "renter" data-sortable = "true">Requestor Name</th>
+                <th data-name = "loc" data-sortable = "true">Location Name</th>
+                <th data-name = "dev" data-sortable = "true">Device Name</th>
+                <th data-name = "status" data-sortable = "true">Status</th>
+                <th data-name = "perm" data-sortable = "true">Permanent?</th>
+                <th data-name = "return" data-sortable = "true">Return Date</th>
+            </tr>
+        </thead>
+        <tbody id="tablebodymain">
+        </tbody>
+        </table>
+	  </div>
+
+<%
+/*
+	Get all tickets.
+*/
+Ticket[] tickets  = TicketQueries.getAllTickets();
+String ticketStr = Ticket.arrayToString(tickets);
+%>
+
+<script>
+  /*
+  	Turn tickets into strings that can be displayable in the ticket hub menu.
+  */
+  window.json = '<%=ticketStr%>';
+  var ticks = JSON.parse(window.json);
+
+  /*
+  	This displays the tickets.
+  */
+  populateTickets(ticks);
+
+  /*
+  	Managing the event listeners on the page.
+  */
+
+  // Search bar listener
+  var searchbar = document.getElementsByName('searchBar');
+  searchbar[0].onkeyup = refresh;
+
+  /*
+  	Params: tickets - array of objects, formatted as tickets.
+  	This function will display tickets in a table on the webpage.
+  */
+  function populateTickets(tickets){
+      var html = "";
+      for(var i = 0; i < tickets.length; i++){
+      		// Iteratively, a string of HTML tags is built that will later be placed
+      		// inside of a table block, formatted in a way so all the proper information
+      		// is displayed.
+		    // TODO : NEED TO ADD IN RETURN DATE AT END BUT THAT WOULD BREAK THINGS AT THE MOMENT
+		    html += "<tr class = 'entry' id = '" + i + "'><td>" + tickets[i].id + "</td><td>" + tickets[i].username + "</td><td>" + tickets[i].locationname + "</td><td>" + tickets[i].devicename + "</td><td>" + tickets[i].status + "</td><td>" + tickets[i].permanent + "</td><td>" + tickets[i].return + "</td></tr>";
+		  }
+		  document.getElementById("tablebodymain").innerHTML = html;
+  }
+  
+  /*
+  	This function "refreshes" the page while search query is performed.
+  	It essentially filters the tickets based on search criteria, 
+  	and redisplays them, while adding back their event listeners.
+  */
+  function refresh() {
+    populateTickets(fuzzyFilter(JSON.parse(window.json)));
+    //adds event listeners to all table records
+  }
+  
+  /*
+  	Params: ticketArray - Array of objects, formatted as tickets.
+  	Output: finalResults - Array of objects, formatted as tickets, but filtered by search text.
+  	This function is executed on the search bar's key-up event listener, and based on the input text,
+  	will filter what is currently displayed in the table based on user input. It implements a scoring system
+  	that determines how "matching" a table string is to the user input.
+  */
+  function fuzzyFilter(ticketArray) {
+      // Pass #1: filter by id
+      var searchText = document.getElementsByName('searchBar')[0].value;
+      var options = {
+        pre: "<span style='color: darkmagenta; font-size: 115%'><b>",
+        post: '</b></span>',
+        extract: function(arg) {return ''+arg.id;}
+      }
+      var idFilterResults = fuzzy.filter(searchText, ticketArray, options);
+      for (var i = idFilterResults.length - 1; i >= 0; i--) {
+        idFilterResults[i].original.id=idFilterResults[i].string;
+      }
+      // Pass #2: filter by status
+      options.extract=function(arg) {return arg.status;}
+      var statusFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = statusFilterResults.length-1;i >=0; i--) {
+        statusFilterResults[i].original.status=statusFilterResults[i].string;
+      }
+      // Pass #3: filter by username
+      options.extract=function(arg) {return arg.username;}
+      var usernameFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = usernameFilterResults.length-1;i >=0; i--) {
+        usernameFilterResults[i].original.username=usernameFilterResults[i].string;
+      }
+      // Pass #4: filter by locationname
+      options.extract=function(arg) {return arg.locationname;}
+      var locationnameFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = locationnameFilterResults.length-1;i >=0; i--) {
+        locationnameFilterResults[i].original.locationname=locationnameFilterResults[i].string;
+      }
+      // Pass #5: filter by devicename
+      options.extract=function(arg) {return arg.devicename;}
+      var devicenameFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = devicenameFilterResults.length-1;i >=0; i--) {
+        devicenameFilterResults[i].original.devicename=devicenameFilterResults[i].string;
+      }
+      // Pass #6: filter by return
+      options.extract=function(arg) {return arg.return;}
+      var returnFilterResults = fuzzy.filter(searchText, ticketArray, options)
+      for (var i = returnFilterResults.length-1;i >=0; i--) {
+        returnFilterResults[i].original.return=returnFilterResults[i].string;
+      }
+
+      var filteredResults = union([idFilterResults, statusFilterResults, usernameFilterResults, locationnameFilterResults, devicenameFilterResults, returnFilterResults]);
+
+	  // this returns a filtered array of objects with attributes 'index', 'original', 'score', and 'string'
+	  // I am interested in the 'original' attribute, which is the relevant object exactly as it was submitted,
+	  // and the 'string' attribute, which is the attribute that was compared against with matching characters conveniantly bolded
+	  var finalResults = new Array(filteredResults.length);
+	
+	  for (var i = 0; i < finalResults.length; i++) {
+	    finalResults[i]= {
+	      id:filteredResults[i].original.id,
+	      status:filteredResults[i].original.status,
+	      username:filteredResults[i].original.username,
+	      locationname:filteredResults[i].original.locationname,
+	      devicename:filteredResults[i].original.devicename,
+	      return:filteredResults[i].original.return,
+	      permanent:filteredResults[i].original.permanent,
+	    };
+	  }
+		
+	  return finalResults;
+  }
+	
+  /*
+  	Params: arrays - a set of arrays that will be unioned together.
+  	Output: One array, union of the input
+  	Unions array results and removes duplicates. This is needed to support
+  	fuzzy filter search.
+  */
+  function union(arrays) {
+    if(arrays.length == 2) 
+      return(unionBaseCase(arrays[0],arrays[1]))
+    if(arrays.length == 1)
+      return(arrays[0])
+    else{
+      var pivot = Math.floor(arrays.length/2);
+      var arrayA=arrays.slice(0,pivot);
+      var arrayB=arrays.slice(pivot);
+      return union([union(arrayA),union(arrayB)]);
+    }
+  }
+
+  /*
+  	Params: array1 - first array we are unioning, array2 - second array we are unioning
+  	Output: results - One array, the union of the two inputs.
+  	This is where tha magic happens and the actual union occurs between two arrays.
+  */
+  function unionBaseCase(array1,array2) {
+    var results = new Array();
+    while(array1.length>0 && array2.length>0) {
+      if(array1[0].index == array2[0].index){
+        array1.splice(0,1);
+      }
+      else
+        results.push((array1[0].index > array2[0].index ? array2.splice(0,1)[0] : array1.splice(0,1)[0]))
+    }
+    results = results.concat(array1);
+    results = results.concat(array2);
+    return results;
+  }
+</script>
+<script src="../../javascript/lib/fuzzy.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/WebContent/html/webpages/components/adminnavbar.jsp b/WebContent/html/webpages/components/adminnavbar.jsp
index e3cde2c..4bfbe33 100644
--- a/WebContent/html/webpages/components/adminnavbar.jsp
+++ b/WebContent/html/webpages/components/adminnavbar.jsp
@@ -9,7 +9,7 @@
 			<span class="icon-bar"></span>
 		</button>
 		<a class="navbar-brand" href="../index.jsp">
-			<img src="../../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%; display: inline-block;">
+			<img src="../../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 20px; width: 16.025px; display: inline-block;">
 		</a>
 		<a class="navbar-brand" href="../profileSettings.jsp">
 		<p style = "display: inline-block" id = "user"></p>
@@ -80,5 +80,5 @@
 var name = '<%=navname%>';
 document.getElementById('user').innerHTML = "Hi " + name + "!";
 if(<%=admin%> == 1)
-document.getElementById('adminbar').innerHTML = '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin Hub <span class="caret"></span></a><ul class="dropdown-menu"><li><a href="admin.jsp">Admin Hub Main</a></li><li><a href="adminApprove.jsp">Ticket Hub</a></li><li><a href="adminDeviceSettings.jsp">Device Hub</a></li><li><a href="adminLocation.jsp">Location Hub</a></li><li class="option"><a href="adminpasswordsetting.jsp">Update Password/Pincode</a></li></ul>'
+document.getElementById('adminbar').innerHTML = '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin Hub <span class="caret"></span></a><ul class="dropdown-menu"><li><a href="admin.jsp">Admin Hub Main</a></li><li><a href="adminApprove.jsp">Ticket Approval Hub</a></li><li><a href="allTickets.jsp">All Tickets Hub</a></li><li><a href="adminDeviceSettings.jsp">Device Hub</a></li><li><a href="adminLocation.jsp">Location Hub</a></li><li class="option"><a href="adminpasswordsetting.jsp">Update Password/Pincode</a></li></ul>'
 </script>
\ No newline at end of file
diff --git a/WebContent/html/webpages/components/adminsidebar.jsp b/WebContent/html/webpages/components/adminsidebar.jsp
index 42f8a31..537e7f6 100644
--- a/WebContent/html/webpages/components/adminsidebar.jsp
+++ b/WebContent/html/webpages/components/adminsidebar.jsp
@@ -2,7 +2,8 @@
 <div>
 <ul class="nav nav-sidebar">
 	<h4>Admin Options</h4>
-	<li class="option"><a href="adminApprove.jsp">Ticket Hub</a></li>
+	<li class="option"><a href="adminApprove.jsp">Ticket Approval Hub</a></li>
+	<li class="option"><a href="allTickets.jsp">All Tickets Hub</a></li>
 	<!-- will add in when maegan is done <li class="option"><a href="#">Manage Admins</a></li> -->
 	<li class="option"><a href="adminDeviceSettings.jsp">Device Hub</a></li>
 	<li class="option"><a href="adminLocation.jsp">Location Hub</a></li>
diff --git a/WebContent/html/webpages/components/navbar.jsp b/WebContent/html/webpages/components/navbar.jsp
index ac1ec25..99c35ac 100644
--- a/WebContent/html/webpages/components/navbar.jsp
+++ b/WebContent/html/webpages/components/navbar.jsp
@@ -9,7 +9,7 @@
 			<span class="icon-bar"></span>
 		</button>
 		<a class="navbar-brand" href="index.jsp">
-			<img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 100%; display: inline-block;">
+			<img src="../imgs/synchrony-financial-logo-dlpx_1.png" style = "height: 20px; width: 16.025px; display: inline-block;">
 		</a>
 		<a class="navbar-brand" href="profileSettings.jsp">
 		<p style = "display: inline-block" id = "user"></p>
@@ -74,5 +74,5 @@
 var name = '<%=navname%>';
 document.getElementById('user').innerHTML = "Hi " + name + "!";
 if(<%=admin%> == 1)
-document.getElementById('adminbar').innerHTML = '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin Hub <span class="caret"></span></a><ul class="dropdown-menu"><li><a href="administration/admin.jsp">Admin Hub Main</a></li><li><a href="administration/adminApprove.jsp">Ticket Hub</a></li><li><a href="administration/adminDeviceSettings.jsp">Device Hub</a></li><li><a href="administration/adminLocation.jsp">Location Hub</a></li><li class="option"><a href="administration/adminpasswordsetting.jsp">Update Password/Pincode</a></li></ul>'
+document.getElementById('adminbar').innerHTML = '<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Admin Hub <span class="caret"></span></a><ul class="dropdown-menu"><li><a href="administration/admin.jsp">Admin Hub Main</a></li><li><a href="administration/adminApprove.jsp">Ticket Approval Hub</a></li><li><a href="administration/allTickets.jsp">All Tickets Hub</a></li><li><a href="administration/adminDeviceSettings.jsp">Device Hub</a></li><li><a href="administration/adminLocation.jsp">Location Hub</a></li><li class="option"><a href="administration/adminpasswordsetting.jsp">Update Password/Pincode</a></li></ul>'
 </script>
\ No newline at end of file
diff --git a/WebContent/html/webpages/returnComplete.jsp b/WebContent/html/webpages/returnComplete.jsp
index 30e6408..398daa8 100644
--- a/WebContent/html/webpages/returnComplete.jsp
+++ b/WebContent/html/webpages/returnComplete.jsp
@@ -29,7 +29,7 @@ pageEncoding="ISO-8859-1"%>
     <p>Thanks for returning some devices!</p>
     <p>You can ship the devices to the following address:</p>
     <div style = "background-color: white; display: inline-block; padding: 10px; margin-bottom: 5px; border-radius: 5px;">
-      Synchrony Financial<br>777 Long Ridge Road<br>Stamford, CT<br>06902
+      Synchrony Financial<br>ATTN: Jake Miller<br>777 Long Ridge Road<br>Stamford, CT<br>06902
     </div>
     <form action = "returnPage.jsp">
      <button type = "submit" class = "btn btn-primary">Go Back</button>
diff --git a/WebContent/passwordreset.jsp b/WebContent/passwordreset.jsp
index 7d43820..0a5ff34 100644
--- a/WebContent/passwordreset.jsp
+++ b/WebContent/passwordreset.jsp
@@ -1,9 +1,5 @@
-<%@ page import = "database.*,entities.User,utilities.Mail" %>
+<%@ page import = "database.*,entities.User,utilities.Mail,java.sql.*,java.security.MessageDigest,java.security.NoSuchAlgorithmException,java.util.Random" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
-<%@ page import = "java.sql.*" %>
-<%@ page import = "java.security.MessageDigest" %>
-<%@ page import = "java.security.NoSuchAlgorithmException" %>
-<%@ page import = "java.util.Random" %>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
@@ -18,8 +14,8 @@
 
   <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
   <link rel = "stylesheet" type = "text/css" href = "html/css/stylesheet.css">
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
   <link rel = "shortcut icon" href = "html/imgs/synchrony-financial-logo-dlpx_1.ico">
 </head>
 <body>
@@ -28,15 +24,12 @@
 	</nav>
 	<div  id = "info" style = "margin-left: 10px; visibility: hidden;">
 		<h2>Password Reset</h2>
-		<h3 id = "msg"></h3>
+		<h3 id = "msg">Please check your email to get your newly generated password!</h3>
 		<button class = "btn btn-primary" onclick="goBack()">Go Back</button>
 	</div>
 </body>
 <%
 int success=0;
-/*
-	If the user wants to reset their password, we will keep them on this page.
-*/
 if(request.getParameter("reset") != null){
 	int ssoNum = Integer.parseInt(request.getParameter("username"));
 	String email = request.getParameter("email");
@@ -130,10 +123,6 @@ if(request.getParameter("reset") != null){
 /*
 	At this point, we show the user what happened.
 */
-if(<%=success%> == 1)
-	document.getElementById("msg").innerHTML = "Please check your email to get your newly generated password!";
-else
-	document.getElementById("msg").innerHTML = "Email and SSO Number did not match. Please go back and try again.";
 document.getElementById("info").style.visibility = 'visible';
 document.getElementById("navbaruniversal").style.visibility = 'visible';
 
diff --git a/src/database/AdminQueries.java b/src/database/AdminQueries.java
index 5a3a364..ad0bddc 100644
--- a/src/database/AdminQueries.java
+++ b/src/database/AdminQueries.java
@@ -2,12 +2,22 @@
 
 import java.sql.*;
 
+/**
+ * This class is responsible for performing most queries corresponding
+ * to admin (object) actions.
+ * @author Connor Jackson
+ *
+ */
 public class AdminQueries {
 
 	private static String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317";
 	private static String user = "b372dfe7409692";
 	private static String password = "74f6e317";
 	
+	/**
+	 * This function determines if a certain user is an admin.
+	 * @author Connor Jackson
+	 */
 	public static boolean isAdmin(int id) throws ClassNotFoundException, SQLException, InterruptedException{
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
@@ -38,8 +48,7 @@ public static boolean isAdmin(int id) throws ClassNotFoundException, SQLExceptio
 	
 	/**
 	 * Checks to see if a pincode is numeric.
-	 * @param pincode
-	 * @return
+	 * @author Connor Jackson
 	 */
 	public static boolean pincodeInt(String pincode){
 		try{
diff --git a/src/database/TicketQueries.java b/src/database/TicketQueries.java
index 65d29d7..85a2701 100644
--- a/src/database/TicketQueries.java
+++ b/src/database/TicketQueries.java
@@ -3,14 +3,23 @@
 import java.sql.*;
 import java.util.Date;
 import entities.Ticket;
-import entities.User;
 
+/**
+ * This class is responsible for performing most queries corresponding
+ * to ticket actions.
+ * @author Brianna Boyce, Connor Jackson, Adam Claxton
+ *
+ */
 public class TicketQueries {
 
 	private static String database = "jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317";
 	private static String user = "b372dfe7409692";
 	private static String password = "74f6e317";
 	
+	/**
+	 * This function generates a ticket entry in the database.
+	 * @author Brianna Boyce
+	 */
 	public static int generateTicket(int requester, int location, int device, String returnDate, int perm) 
 			throws ClassNotFoundException, SQLException, InterruptedException
 	{
@@ -58,8 +67,11 @@ public static int generateTicket(int requester, int location, int device, String
 		return ticketID;
 	}
 	
-	//get all tickets 
-	public static Ticket[] getTickets() 
+	/**
+	 * This function retrieves all tickets that need to be reviewed by an administrator for approval.
+	 * @author Brianna Boyce
+	 */
+	public static Ticket[] getRequestedTickets() 
 			throws SQLException, ClassNotFoundException, InterruptedException{
 		int i = 0;
 		System.getenv("VCAP_SERVICES");
@@ -111,9 +123,14 @@ public static Ticket[] getTickets()
 		connection.close();
 		return tickets;
 	}
-		
-	public static void acceptTicket(int ticketid, int deviceid, int locationid, int sso, int perm) 
+	
+	/**
+	 * This function retrieves all tickets. Ever.
+	 * @author Connor Jackson
+	 */
+	public static Ticket[] getAllTickets() 
 			throws SQLException, ClassNotFoundException, InterruptedException{
+		int i = 0;
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connection;
@@ -136,22 +153,40 @@ public static void acceptTicket(int ticketid, int deviceid, int locationid, int
 				Thread.sleep(1);
 			}
 		}
-		long milliseconds = new java.util.Date().getTime();
-		String query = "UPDATE ticket, devices SET ticket.Status = \"Approved\""
-						+", ticket.Status_Date_Fields = " + milliseconds
-						+", devices.Ticket_ID = " + ticketid
-						+", devices.Status = \"Ready to Ship\", devices.Renter = " + sso
-						+", devices.Location = " + locationid 
-						+", devices.Permanent = " + perm
-						+" WHERE ticket.Ticket_ID = " + ticketid + " AND devices.Device_ID = " + deviceid;
-		System.out.println("Executing query: "+query); 				
-		stmt.executeUpdate(query);
-
+		ResultSet resultSet = stmt.executeQuery("SELECT ticket.*, employee.Name AS 'username', devices.Device_Name, location.Name AS 'locationname' FROM ticket INNER JOIN employee ON ticket.Requestor = employee.Employee_ID INNER JOIN devices ON ticket.Device_ID = devices.Device_ID INNER JOIN location ON ticket.Location = location.Location_ID");
+		resultSet.last();
+		int rows = resultSet.getRow();
+		resultSet.beforeFirst();
+		Ticket[] tickets = new Ticket[rows];
+			
+		while(resultSet.next()){
+			tickets[i] = new Ticket(
+					resultSet.getInt("Ticket_ID"),
+					resultSet.getInt("Requestor"),
+					resultSet.getLong("Request_Date"),
+					resultSet.getInt("Location"),
+					resultSet.getInt("Device_ID"),
+					resultSet.getString("Status"),
+					resultSet.getLong("Status_Date_Fields"),
+					resultSet.getString("Return_Date"),
+					resultSet.getString("username"),
+					resultSet.getString("Device_Name"),
+					resultSet.getString("locationname"),
+					resultSet.getInt("Permanent_Order")
+					);
+			i++;
+		}
 		stmt.close();
 		connection.close();
+		return tickets;
 	}
-		
-	public static void rejectTicket(int id) 
+	
+	/**
+	 * This function accepts a ticket, and assigns that ticket & device to its
+	 * corresponding renter and location.
+	 * @author Connor Jackson
+	 */
+	public static void acceptTicket(int ticketid, int deviceid, int locationid, int sso, int perm) 
 			throws SQLException, ClassNotFoundException, InterruptedException{
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
@@ -175,16 +210,26 @@ public static void rejectTicket(int id)
 				Thread.sleep(1);
 			}
 		}
-		long milliseconds = new Date().getTime();
-		String query="UPDATE ticket SET Status = \"Rejected\", Status_Date_Fields = "+milliseconds+" WHERE Ticket_ID = " + id;
-		System.out.println("Executing query "+query);
+		long milliseconds = new java.util.Date().getTime();
+		String query = "UPDATE ticket, devices SET ticket.Status = \"Approved\""
+						+", ticket.Status_Date_Fields = " + milliseconds
+						+", devices.Ticket_ID = " + ticketid
+						+", devices.Status = \"Ready to Ship\", devices.Renter = " + sso
+						+", devices.Location = " + locationid 
+						+", devices.Permanent = " + perm
+						+" WHERE ticket.Ticket_ID = " + ticketid + " AND devices.Device_ID = " + deviceid;
+		System.out.println("Executing query: "+query); 				
 		stmt.executeUpdate(query);
+
 		stmt.close();
 		connection.close();
 	}
-
-	// Returns millisecond value of the most recently modified ticket assigned to 'employee' with status 'status'
-	public static long getLatestTicketActivity(User employee, String status) 
+	
+	/**
+	 * This function rejects a ticket.
+	 * @author Connor Jackson
+	 */
+	public static void rejectTicket(int id) 
 			throws SQLException, ClassNotFoundException, InterruptedException{
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
@@ -208,16 +253,18 @@ public static long getLatestTicketActivity(User employee, String status)
 				Thread.sleep(1);
 			}
 		}
-		String query = "SELECT MAX(Status_Date_Fields) FROM ticket WHERE Requestor = "+employee.getID()+" AND Status = '"+status+"';";
-		System.out.println("Executing query '"+query+"'");
-		ResultSet results = stmt.executeQuery(query);
-		results.next();
+		long milliseconds = new Date().getTime();
+		String query="UPDATE ticket SET Status = \"Rejected\", Status_Date_Fields = "+milliseconds+" WHERE Ticket_ID = " + id;
+		System.out.println("Executing query "+query);
+		stmt.executeUpdate(query);
 		stmt.close();
 		connection.close();
-		return results.getLong("MAX(Status_Date_Fields)");
 	}
 
-	// Returns all tickets changed to 'status' since 'millieconds' and associated with 'employee' 
+	/**
+	 * Returns all tickets changed to 'status' since 'milliseconds' and associated with 'employee'
+	 * @author Adam Claxton 
+	 */
 	public static Ticket[] getRecentlyChangedTickets(int userID, String status, long milliseconds) throws SQLException, ClassNotFoundException {
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
@@ -258,6 +305,11 @@ public static Ticket[] getRecentlyChangedTickets(int userID, String status, long
 		return tickets;
 	}
 	
+	/**
+	 * Gets the SSO number from a certain ticket. This is to support sending an email to an employee
+	 * when an action is changed on a ticket.
+	 * @author Adam Claxton
+	 */
 	public static int getUserID(int ticketID) throws ClassNotFoundException, SQLException, InterruptedException{
 		System.getenv("VCAP_SERVICES");
 		Class.forName("com.mysql.jdbc.Driver");
diff --git a/src/utilities/Mail.java b/src/utilities/Mail.java
index de32c30..1a34837 100644
--- a/src/utilities/Mail.java
+++ b/src/utilities/Mail.java
@@ -1,11 +1,7 @@
 package utilities;
 
 import java.awt.HeadlessException;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStreamReader;
 import java.util.*;
 import javax.mail.*;
 import javax.mail.internet.*;
@@ -13,8 +9,6 @@
 import entities.Ticket;
 import entities.User;
 
-import javax.activation.*;
-
 
 public class Mail {
     private String sender = "Senior.design.synchrony.test@gmail.com";