diff --git a/WebContent/html/webpages/administration/admin.jsp b/WebContent/html/webpages/administration/admin.jsp
index 6719058..c36986e 100644
--- a/WebContent/html/webpages/administration/admin.jsp
+++ b/WebContent/html/webpages/administration/admin.jsp
@@ -74,7 +74,8 @@ div.approveConfirm {
 		<%@ include file="../components/adminsidebar.jsp" %>
 	</div>
 	<div class="displayDevice">
-		<h2>Welcome to the admin page</h2>
+		<h2>Welcome to The Admin Hub!</h2>
+		<h3>Select from any option in the sidebar to exert your administrative power!</h3>
 		<div id="admin"></div>
 	</div>
 
diff --git a/WebContent/html/webpages/administration/adminDeviceSettings.jsp b/WebContent/html/webpages/administration/adminDeviceSettings.jsp
index f19c36f..28ae345 100644
--- a/WebContent/html/webpages/administration/adminDeviceSettings.jsp
+++ b/WebContent/html/webpages/administration/adminDeviceSettings.jsp
@@ -88,19 +88,23 @@ pageEncoding="ISO-8859-1"%>
             <label for="addName">Device Name *</label>
             <input style = "width: 150px;" name = "name" class="form-control" id="addName" placeholder="Device Name" required = "true">
           </div>
+          <div class = "form-group">
+            <label for="addPos">Locker Position</label>
+            <input style = "width: 150px;" name = "locker" class="form-control" id="addPos" placeholder="Locker Position">
+          </div>
           <div class = "form-group">
             <label for="addDesc">Description</label>
             <textarea style = "width: 200px;" name = "description" class="form-control" rows = "5" id="addDesc" placeholder="Description"></textarea>
           </div>
+          <div class = "form-group">
+            <label for="addcomment">Admin Comments</label>
+            <textarea style = "width: 200px;" name = "admincomments" class="form-control" rows = "5" id="addcomment" placeholder="Comments"></textarea>
+          </div>
           <div class = "form-group">
            <label for="addAvailability">Availability *</label>
            <select required style = "width 190px;" name = "status" class="form-control" id="addAvailability">
            </select>
          </div>
-         <div class = "form-group">
-          <label for="addMAC">MAC Address</label>
-          <input style = "width: 150px;" name = "MAC" class="form-control" id="addMAC" placeholder="MAC Address">
-        </div>
         <div class = "form-group">
           <label for="addManu">Manufacturer *</label>
           <select required style = "width: 190px;" name = "manu" class="form-control" id="addManu">
@@ -111,10 +115,18 @@ pageEncoding="ISO-8859-1"%>
           <select required style = "width: 160px;" name = "hardware" class="form-control" id="addHardware">
           </select>
         </div>
+        <div class = "form-group">
+          <label for="addOS">Operating System</label>
+          <input style = "width: 150px;" name = "OS" class="form-control" id="addOS" placeholder="OS">
+        </div>
         <div class = "form-group">
           <label for="addModel">Model Name *</label>
           <input style = "width: 150px;" name = "model" class="form-control" id="addModel" placeholder="Model Name" required = "true">
         </div>
+        <div class = "form-group">
+          <label for="addMAC">MAC Address</label>
+          <input style = "width: 150px;" name = "MAC" class="form-control" id="addMAC" placeholder="MAC Address">
+        </div>
         <div class = "form-group">
           <label for="addSerial">Serial Number</label>
           <input style = "width: 150px;" name = "serial" class="form-control" id="addSerial" placeholder="Serial Number">
@@ -143,10 +155,18 @@ pageEncoding="ISO-8859-1"%>
           <label for="modifyName">Device Name *</label>
           <input style = "width: 150px;" name = "name" class="form-control" id="modifyName" placeholder="Device Name" required = "true">
         </div>
+        <div class = "form-group">
+            <label for="modifyPos">Locker Position</label>
+            <input style = "width: 150px;" name = "locker" class="form-control" id="modifyPos" placeholder="Locker Position">
+          </div>
         <div class = "form-group">
           <label for="modifyDesc">Description</label>
           <textarea style = "width: 200px;" name = "description" class="form-control" rows = "5" id="modifyDesc" placeholder="Description"></textarea>
         </div>
+        <div class = "form-group">
+            <label for="modifycomment">Admin Comments</label>
+            <textarea style = "width: 200px;" name = "admincomments" class="form-control" rows = "5" id="modifycomment" placeholder="Comments"></textarea>
+          </div>
         <div class = "form-group">
          <label for="modifyAvailability">Availability *</label>
          <select required style = "width 190px;" name = "status" class="form-control" id="modifyAvailability">
@@ -166,6 +186,10 @@ pageEncoding="ISO-8859-1"%>
         <select required style = "width: 160px;" name = "hardware" class="form-control" id="modifyHardware">
         </select>
       </div>
+      <div class = "form-group">
+          <label for="modifyOS">Operating System</label>
+          <input style = "width: 150px;" name = "OS" class="form-control" id="modifyOS" placeholder="OS">
+        </div>
       <div class = "form-group">
         <label for="modifyModel">Model Name *</label>
         <input style = "width: 150px;" name = "model" class="form-control" id="modifyModel" placeholder="Model Name" required = "true">
@@ -187,8 +211,7 @@ pageEncoding="ISO-8859-1"%>
 </div>
 <div class = "displayDevice">
   <!-- Main body! -->
-  <h2>Device Listing</h2>
-
+  <h2>Device Hub</h2>
   <form onsubmit="return false;" class="form-inline">
     <input type="search" class="form-control" name="searchBar" placeholder=" search for devices" autocomplete="off" style="width: 50%; text-align: left; margin: 1%;"  />
     <button id ="add" class="btn btn-primary">Add Device</button>
@@ -199,11 +222,14 @@ pageEncoding="ISO-8859-1"%>
     <thead>
       <tr>
         <th>Name</th>
+        <th>Locker Position</th>
         <th class = "column">Description</th>
+        <th class = "column">Admin Comments</th>
         <th>Availability</th>
         <th>MAC Address</th>
         <th>Manufacturer</th>
         <th>Hardware Type</th>
+        <th>Operating System</th>
         <th>Model Name</th>
         <th>Serial Number</th>
         <th>NFC ID</th>
@@ -278,7 +304,7 @@ document.getElementById('modifyAvailability').innerHTML = availabilityHTML;
 function populateDevices(deviceArray){
   var html = "";
   for(var i = 0; i < deviceArray.length; i++){
-    html += "<tr class = 'entry' id = '" + deviceArray[i].id + "'><td>" + deviceArray[i].name + "</td><td>" + deviceArray[i].description + "</td><td>" + deviceArray[i].status + "</td><td>" + deviceArray[i].mac + "</td><td>" + deviceArray[i].manufacturer + "</td><td>" + deviceArray[i].hardware + "</td><td>" + deviceArray[i].model + "</td><td>" + deviceArray[i].serial + "</td><td>" + deviceArray[i].nfc + "</td></tr>";
+    html += "<tr class = 'entry' id = '" + deviceArray[i].id + "'><td>" + deviceArray[i].name + "</td><td>" + deviceArray[i].locker + "</td><td>" + deviceArray[i].description + "</td><td>" + deviceArray[i].admincomment + "</td><td>" + deviceArray[i].status + "</td><td>" + deviceArray[i].mac + "</td><td>" + deviceArray[i].manufacturer + "</td><td>" + deviceArray[i].hardware + "</td><td>" + deviceArray[i].os + "</td><td>" + deviceArray[i].model + "</td><td>" + deviceArray[i].serial + "</td><td>" + deviceArray[i].nfc + "</td></tr>";
     if(findInArray(deviceArray[i].manufacturer,manufacturers) == false){
       manufacturers.push(deviceArray[i].manufacturer);
     }
@@ -431,6 +457,9 @@ function modifyModal(){
   $("#modifyModel").val(devices[i].model.replace(/&quot;/g,"\""));
   $("#modifySerial").val(devices[i].serial);
   $("#modifyNFC").val(devices[i].nfc);
+  $("#modifyOS").val(devices[i].os);
+  $("#modifycomment").val(devices[i].admincomment);
+  $("#modifyPos").val(devices[i].locker);
   $("#modifyID").val(devices[i].id);
   $("#modifyModal").show();
 }
diff --git a/WebContent/html/webpages/administration/adminLocation.jsp b/WebContent/html/webpages/administration/adminLocation.jsp
index 76d6d88..a4bc324 100644
--- a/WebContent/html/webpages/administration/adminLocation.jsp
+++ b/WebContent/html/webpages/administration/adminLocation.jsp
@@ -15,6 +15,9 @@
   <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/1.12.4/jquery.min.js"></script>
   <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+  <script async defer
+    src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCndOcexx4GAOGkRKBeK1E43u_sB9gjcaU">
+    </script>
   <link rel = "stylesheet" type = "text/css" href = "../../css/stylesheet.css">
   <link rel = "shortcut icon" href = "../../imgs/synchrony-financial-logo-dlpx_1.ico">
   <style>
@@ -72,7 +75,7 @@
                 </div>
                 <div class = "form-group">
                     <label for="addState">State *</label>
-                    <select required style = "width: 150px;" name = "state" class="form-control">
+                    <select id = "addState" required style = "width: 150px;" name = "state" class="form-control">
                       <option value="" disabled selected>Choose State</option>
                       <option value="AL">Alabama</option>
                       <option value="AK">Alaska</option>
@@ -131,7 +134,15 @@
                     <label for="addZip">Zip Code *</label>
                     <input style = "width: 100px;" name = "zip" type = "number" class="form-control" id="addZip" placeholder="Zip Code" required = "true">
                 </div>
-                <button type = "submit" name = "add" value = "Add" class="btn btn-primary">Add</button>
+                <div class = "form-group">
+                    <label for="addlat">Latitude</label>
+                    <input style = "width: 150px;" type = "text" id = "addlat" class="form-control" name = "lat">
+                </div>
+                <div class = "form-group">
+                    <label for="addlng">Longitude</label>
+                    <input style = "width: 150px;" type = "text" id = "addlng" class="form-control" name = "lng">
+                </div>
+                <button id = "theaddbutton" type = "submit" name = "add" value = "Add" class="btn btn-primary">Add</button>
               </form>
             </div>
         </div>
@@ -222,6 +233,14 @@
                     <label for="modifyZip">Zip Code *</label>
                     <input style = "width: 100px;" name = "zip" type = "number" class="form-control" id="modifyZip" required = "true">
                 </div>
+                <div class = "form-group">
+                    <label for="modifylat">Latitude</label>
+                    <input style = "width: 150px;" type = "text" id = "modifylat" class="form-control" name = "lat">
+                </div>
+                <div class = "form-group">
+                    <label for="modifylng">Longitude</label>
+                    <input style = "width: 150px;" type = "text" id = "modifylng" class="form-control" name = "lng">
+                </div>
                 <button id = "themodifybutton" type = "submit" name = "modify" value = "Save Changes" class="btn btn-primary">Save Changes</button>
                 <button id = "thedeletebutton" type = "submit" name = "delete" value = "Delete Entry" class="btn btn-primary" style = "display: inline-block;" title = "hello">Delete</button>
                 <input type = "text" id = "modifyID" name = "id" style = "display: none;">
@@ -249,14 +268,12 @@
   <button id ="add" class="btn btn-primary">Add Location</button>
 </div>
 <%
-
 //database query to get locations that all employees can access
 Location[] locations = LocationQueries.getAdminLocations();
 //string representation of array.
 String locationString = Location.arrayToString(locations);
 locationString = locationString.replace("'","\\'");
 %>
-
 <script type=text/javascript>
 
 //JSON representation of array.
@@ -264,6 +281,9 @@ var locations = makeLocationArray();
 //Populate locations into table!
 populateLocations();
 
+//geocode listeners
+$("#addZip").keyup(geocodeTown);
+$("#modifyZip").keyup(geocodeTown);
 //adds event listeners to all table records
 $("tr.entry").click(modifyModal);
 //Exits modal when x is clicked.
@@ -317,6 +337,14 @@ function modifyModal(){
   $("#modifyZip").val(locations[i].zip);
   $("#modifyID").val(locations[i].id);
   
+  var geocoder =  new google.maps.Geocoder();
+  //this function assumes that you are using a proper zip code...
+  geocoder.geocode({'address':locations[i].zip}, function(results,status)
+  	{if (status == google.maps.GeocoderStatus.OK)
+		{$("#modifylat").val(results[0].geometry.location.lat());
+		 $("#modifylng").val(results[0].geometry.location.lng());}
+	});
+  
   //if the location has a foreign key constraint, then the delete button should be restricted
   if(locations[i].numDevices > 0 || locations[i].numEmployees > 0){
   $('#thedeletebutton').attr('disabled',true);
@@ -334,6 +362,21 @@ function closeModifyModal(){
   $("#modifyModal").hide();
 }
 
+//generate the lat & long of a location in real time!
+function geocodeTown(){
+	var id = this.getAttribute('id');
+	var zip = $("#"+id).val();
+	id = id.replace("Zip","");
+	var geocoder =  new google.maps.Geocoder();
+	//this function assumes that you are using a proper zip code...
+	geocoder.geocode({'address':zip}, function(results,status)
+		{if (status == google.maps.GeocoderStatus.OK)
+			{$("#" + id + "lat").val(results[0].geometry.location.lat());
+			 $("#" + id + "lng").val(results[0].geometry.location.lng());}
+		});
+	return true;
+}
+
 </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebContent/html/webpages/components/adminsidebar.jsp b/WebContent/html/webpages/components/adminsidebar.jsp
index 10b20d6..0caa9bc 100644
--- a/WebContent/html/webpages/components/adminsidebar.jsp
+++ b/WebContent/html/webpages/components/adminsidebar.jsp
@@ -2,9 +2,9 @@
 <div>
 <ul class="nav nav-sidebar">
 	<h4>Admin Options</h4>
-	<li class="option"><a href="adminApprove.jsp">Approve Devices</a></li>
+	<li class="option"><a href="adminApprove.jsp">Ticket 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">Manage Devices</a></li>
-	<li class="option"><a href="adminLocation.jsp">Manage Locations</a></li>
+	<li class="option"><a href="adminDeviceSettings.jsp">Device Hub</a></li>
+	<li class="option"><a href="adminLocation.jsp">Location Hub</a></li>
 </ul>
 </div>
\ No newline at end of file
diff --git a/WebContent/html/webpages/redirect/deviceRedirect.jsp b/WebContent/html/webpages/redirect/deviceRedirect.jsp
index 1c2273b..cc1f993 100644
--- a/WebContent/html/webpages/redirect/deviceRedirect.jsp
+++ b/WebContent/html/webpages/redirect/deviceRedirect.jsp
@@ -36,9 +36,12 @@ String hardware = request.getParameter("hardware").replace("\"","\\\"");
 String model = request.getParameter("model").replace("\"","\\\"");
 String serial = request.getParameter("serial");
 String nfc =  request.getParameter("NFC");
+String os = request.getParameter("OS");
+String locker = request.getParameter("locker");
+String comment = request.getParameter("admincomments");
 //add form was submitted
 if(request.getParameter("add") != null){
-  Device device = new Device(name,1,description,hardware,model,manufacturer,status,mac,serial,nfc);
+  Device device = new Device(name,1,description,hardware,model,manufacturer,status,mac,serial,nfc,locker,os,comment);
   DeviceQueries.addDevice(device);
 }
 
@@ -48,7 +51,7 @@ if(request.getParameter("modify") != null){
   String strID = request.getParameter("id");
   //turn to int for constructor
   int id = Integer.parseInt(strID);
-  Device device = new Device(name,id,description,hardware,model,manufacturer,status,mac,serial,nfc);
+  Device device = new Device(name,id,description,hardware,model,manufacturer,status,mac,serial,nfc,locker,os,comment);
   DeviceQueries.modifyDevice(device);
 }
 
diff --git a/WebContent/html/webpages/redirect/locationRedirect.jsp b/WebContent/html/webpages/redirect/locationRedirect.jsp
index 58bdd32..8700f23 100644
--- a/WebContent/html/webpages/redirect/locationRedirect.jsp
+++ b/WebContent/html/webpages/redirect/locationRedirect.jsp
@@ -32,10 +32,12 @@ String address = request.getParameter("address").replace("\"","\\\"");
 String town = request.getParameter("town").replace("\"","\\\"");
 String state = request.getParameter("state");
 String zip = request.getParameter("zip");
+String lat = request.getParameter("lat");
+String lng = request.getParameter("lng");
 int er = 0;
 //add form was submitted
 if(request.getParameter("add") != null){
-  Location location = new Location(name,address,town,state,zip,0);
+  Location location = new Location(0,name,address,town,state,zip,0,lat,lng);
   LocationQueries.addLocation(location);
 }
 //modify form was submitted
@@ -44,7 +46,7 @@ if(request.getParameter("modify") != null){
   String strID = request.getParameter("id");
   //turn to int for constructor
   int id = Integer.parseInt(strID);
-  Location location = new Location(id,name,address,town,state,zip);
+  Location location = new Location(id,name,address,town,state,zip,0,lat,lng);
   LocationQueries.modifyLocation(location);
 }
 //delete form was submitted
diff --git a/WebContent/html/webpages/redirect/orderFormHandler.jsp b/WebContent/html/webpages/redirect/orderFormHandler.jsp
index dd8e9ba..e768483 100644
--- a/WebContent/html/webpages/redirect/orderFormHandler.jsp
+++ b/WebContent/html/webpages/redirect/orderFormHandler.jsp
@@ -1,4 +1,4 @@
-<%@ page import = "database.*" %>
+<%@ page import = "database.*,entities.Location" %>
 <%@ page import = "entities.User" %>
 <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
 pageEncoding="ISO-8859-1"%>
@@ -23,13 +23,16 @@ pageEncoding="ISO-8859-1"%>
 int location=-1;
 if(Integer.parseInt(request.getParameter("location_dropdown"))==0)
 {
-	location = LocationQueries.addLocation(
+	location = LocationQueries.addLocation(new Location(
+			0,
 			request.getParameter("locname"),
-			request.getParameter("state"),
 			request.getParameter("address"),
 			request.getParameter("town"),
+			request.getParameter("state"),
 			request.getParameter("zip"),
-			Integer.parseInt(navsso)
+			Integer.parseInt(navsso),
+			"",
+			"")
 		);
 }
 
diff --git a/src/database/DeviceQueries.java b/src/database/DeviceQueries.java
index f6ca830..3e779c5 100644
--- a/src/database/DeviceQueries.java
+++ b/src/database/DeviceQueries.java
@@ -126,7 +126,7 @@ public static void addDevice(Device device) throws SQLException, ClassNotFoundEx
 			id = results.getInt("Device_ID");
 			id++;
 			//tries this statement, otherwise tries again with a new id
-			String command = "INSERT INTO devices (Device_ID,Device_Name,Device_Description,MAC_Address,Manufacturer,Hardware,Model,Serial_Num,Status,Added_By,NFC_ID) " + "VALUES (" + id +",\"" + device.getName() + "\",\"" + device.getDesc()+ "\",\"" + device.getMAC() + "\",\"" + device.getManufacturer() + "\",\""+device.getHardware()+ "\",\"" + device.getModel() + "\",\"" + device.getSerial()  + "\",\"" + device.getStatus() + "\",30,\"" + device.getNFC() +  "\");";
+			String command = "INSERT INTO devices (Device_ID,Device_Name,Device_Description,MAC_Address,Manufacturer,Hardware,Model,Serial_Num,Status,NFC_ID,Locker_Position,Operating_System,Admin_Comments) " + "VALUES (" + id +",\"" + device.getName() + "\",\"" + device.getDesc()+ "\",\"" + device.getMAC() + "\",\"" + device.getManufacturer() + "\",\""+device.getHardware()+ "\",\"" + device.getModel() + "\",\"" + device.getSerial()  + "\",\"" + device.getStatus() + "\",\"" + device.getNFC() +  "\",\"" + device.getPos() + "\",\"" + device.getOS() + "\",\"" + device.getComment() +"\");";
 			System.out.println(command);
 			i = stmt.executeUpdate(command);
 		}
@@ -139,7 +139,7 @@ public static void modifyDevice(Device device) throws ClassNotFoundException, SQ
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connection = DriverManager.getConnection(database, user, password);
 		Statement stmt = connection.createStatement();
-		stmt.executeUpdate("UPDATE devices SET Device_Name = \"" + device.getName() + "\", Device_Description = \"" + device.getDesc() + "\", MAC_Address = \"" + device.getMAC() + "\", Manufacturer = \"" + device.getManufacturer() + "\", Hardware = \"" + device.getHardware() + "\", Model = \"" + device.getModel() + "\", Serial_Num = \"" + device.getSerial() + "\", Status = \"" + device.getStatus() + "\", NFC_ID = \"" + device.getNFC() + "\" WHERE Device_ID = " + device.getID());
+		stmt.executeUpdate("UPDATE devices SET Device_Name = \"" + device.getName() + "\", Device_Description = \"" + device.getDesc() + "\", MAC_Address = \"" + device.getMAC() + "\", Manufacturer = \"" + device.getManufacturer() + "\", Hardware = \"" + device.getHardware() + "\", Model = \"" + device.getModel() + "\", Serial_Num = \"" + device.getSerial() + "\", Status = \"" + device.getStatus() + "\", NFC_ID = \"" + device.getNFC() + "\", Admin_Comments = \"" + device.getComment() + "\", Operating_System = \"" + device.getOS() + "\", Locker_Position = \"" + device.getPos() + "\" WHERE Device_ID = " + device.getID());
 		stmt.close();
 		connection.close();
 	}
diff --git a/src/database/LocationQueries.java b/src/database/LocationQueries.java
index 234637b..3370ba3 100644
--- a/src/database/LocationQueries.java
+++ b/src/database/LocationQueries.java
@@ -38,12 +38,6 @@ public static String locationIntToString(int locInt) throws ClassNotFoundExcepti
 		return returnResult;
 	}
 
-	// returns ID of new location
-	public static int addLocation(String name, String state, String address, String town, String zip, int userID) throws SQLException, ClassNotFoundException
-	{
-		return addLocation(new Location(name, address, town, state, zip, userID));
-	}
-
 	// returns ID of new location
 	public static int addLocation(Location location) throws SQLException, ClassNotFoundException
 	{
@@ -60,8 +54,7 @@ public static int addLocation(Location location) throws SQLException, ClassNotFo
 			id = results.getInt("Location_ID");
 			id++;
 			//tries this statement, otherwise tries again with a new id
-			System.out.println("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code,Employee_Flag) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip()+"\","+location.getEmployeeFlag()  + ")");
-			i = stmt.executeUpdate("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code,Employee_Flag) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip()+"\","+location.getEmployeeFlag()  + ")");
+			i = stmt.executeUpdate("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code,Employee_Flag,Latitude,Longitude) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip() + "\"," + location.getEmployeeFlag() + ",\"" + location.getLat() + "\",\"" + location.getLng()  + "\")");
 		}
 		stmt.close();
 		connection.close();
@@ -86,7 +79,17 @@ public static Location[] getAdminLocations() throws ClassNotFoundException, SQLE
 				
 		//iterate result set
 		while(resultSet.next()){
-			locations[counter] = new Location(resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Address"),resultSet.getString("Town"),resultSet.getString("State"),resultSet.getString("Zip_Code"));
+			locations[counter] = new Location(
+					resultSet.getInt("Location_ID"),
+					resultSet.getString("Name"),
+					resultSet.getString("Address"),
+					resultSet.getString("Town"),
+					resultSet.getString("State"),
+					resultSet.getString("Zip_Code"),
+					resultSet.getInt("Employee_Flag"),
+					resultSet.getString("Latitude"),
+					resultSet.getString("Longitude")
+					);
 			counter++;
 		}
 		stmt.close();
@@ -118,7 +121,10 @@ public static Location[] getLocations(int userID) throws SQLException, ClassNotF
 				rs.getString("Address"),
 				rs.getString("Town"),
 				rs.getString("State"),
-				rs.getString("Zip_Code")
+				rs.getString("Zip_Code"),
+				rs.getInt("Employee_Flag"),
+				rs.getString("Latitude"),
+				rs.getString("Longitude")
 				);
 			i++;
 		}
@@ -138,7 +144,7 @@ public static void modifyLocation(Location location) throws ClassNotFoundExcepti
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connect = DriverManager.getConnection("jdbc:mysql://us-cdbr-iron-east-04.cleardb.net/ad_15a989204c2ff8a?user=b372dfe7409692&password=74f6e317", "b372dfe7409692", "74f6e317");
 		Statement stmt = connect.createStatement();
-		stmt.executeUpdate("UPDATE location SET Name = \"" + location.getName() + "\", Address = \"" + location.getAddress() + "\", Town = \"" + location.getTown() + "\", State = \"" + location.getState() + "\", Zip_Code = \"" + location.getZip() + "\" WHERE Location_ID = " + location.getID());
+		stmt.executeUpdate("UPDATE location SET Name = \"" + location.getName() + "\", Address = \"" + location.getAddress() + "\", Town = \"" + location.getTown() + "\", State = \"" + location.getState() + "\", Zip_Code = \"" + location.getZip() + "\", Latitude = \"" + location.getLat() + "\", Longitude = \"" + location.getLng() + "\" WHERE Location_ID = " + location.getID());
 		stmt.close();
 		connect.close();
 	}
@@ -184,7 +190,17 @@ public static Location[] getAllLocations() throws SQLException, ClassNotFoundExc
 			
 		//iterate result set
 		while(resultSet.next()){
-			locations[counter] = new Location(resultSet.getInt("Location_ID"),resultSet.getString("Name"),resultSet.getString("Address"),resultSet.getString("Town"),resultSet.getString("State"),resultSet.getString("Zip_Code"));
+			locations[counter] = new Location(
+					resultSet.getInt("Location_ID"),
+					resultSet.getString("Name"),
+					resultSet.getString("Address"),
+					resultSet.getString("Town"),
+					resultSet.getString("State"),
+					resultSet.getString("Zip_Code"),
+					resultSet.getInt("Employee_Flag"),
+					resultSet.getString("Latitude"),
+					resultSet.getString("Longitude")
+					);
 			counter++;
 		}
 			
diff --git a/src/entities/Device.java b/src/entities/Device.java
index 593fead..ad0eb56 100644
--- a/src/entities/Device.java
+++ b/src/entities/Device.java
@@ -42,13 +42,16 @@ public String toString(){
 		StringBuilder sb = new StringBuilder();
 		String comma = ", ";
 		sb.append("{\"name\": \"").append(Device_Name).append("\"").append(comma);
+		sb.append("\"locker\": \"").append(locker_position).append("\"").append(comma);
 		sb.append("\"id\": \"").append(Device_ID).append("\"").append(comma);
 		sb.append("\"description\": \"").append(Device_Description).append("\"").append(comma);
+		sb.append("\"admincomment\": \"").append(Admin_Comments).append("\"").append(comma);
 		sb.append("\"hardware\": \"").append(Hardware).append("\"").append(comma);
 		sb.append("\"status\": \"").append(Status).append("\"").append(comma);
 		sb.append("\"model\": \"").append(Model).append("\"").append(comma);
 		sb.append("\"manufacturer\": \"").append(Manu).append("\"").append(comma);
 		sb.append("\"mac\": \"").append(MAC).append("\"").append(comma);
+		sb.append("\"os\": \"").append(OS).append("\"").append(comma);
 		sb.append("\"serial\": \"").append(Serial).append("\"").append(comma);
 		sb.append("\"nfc\": \"").append(NFC).append("\"");
 		sb.append("}");
@@ -112,4 +115,16 @@ public String getNFC() {
 	public String getStatus(){
 		return Status;
 	}
+	
+	public String getPos(){
+		return locker_position;
+	}
+	
+	public String getOS(){
+		return OS;
+	}
+	
+	public String getComment(){
+		return Admin_Comments;
+	}
 }
diff --git a/src/entities/Location.java b/src/entities/Location.java
index 97c044e..dbd0960 100644
--- a/src/entities/Location.java
+++ b/src/entities/Location.java
@@ -19,18 +19,25 @@ public class Location {
 	private int employee_flag;
 	private int numDevices;
 	private int numEmployees;
+	private String lat;
+	private String lng;
 	
 	/**
-	 * Constructor for existing location.
-	 * @param name
-	 * @param address
-	 * @param town
-	 * @param state
-	 * @param zip
+	 * Constructor for location bean.
 	 * @throws SQLException 
 	 * @throws ClassNotFoundException 
 	 */
-	public Location(int id, String name, String address, String town, String state, String zip) throws ClassNotFoundException, SQLException{
+	public Location(
+			int id, 
+			String name, 
+			String address, 
+			String town,
+			String state, 
+			String zip, 
+			int flag, 
+			String lat, 
+			String lng
+			) throws ClassNotFoundException, SQLException{
 		this.id = id;
 		this.name = name;
 		this.address = address;
@@ -39,37 +46,9 @@ public Location(int id, String name, String address, String town, String state,
 		this.zip = zip;
 		this.numDevices = LocationQueries.numberDevices(id);
 		this.numEmployees = LocationQueries.numberEmployees(id);
-	}
-	
-	/**
-	 * Constructor for brand new location.
-	 * @param name
-	 * @param address
-	 * @param town
-	 * @param state
-	 * @param zip
-	 * @throws SQLException 
-	 * @throws ClassNotFoundException 
-	 */
-	public Location(String name, String address, String town, String state, String zip) throws ClassNotFoundException, SQLException{
-		this.name = name;
-		this.address = address;
-		this.town = town;
-		this.state = state;
-		this.zip = zip;
-		this.numDevices = LocationQueries.numberDevices(id);
-		this.numEmployees = LocationQueries.numberEmployees(id);
-	}
-	
-	public Location(String name, String address, String town, String state, String zip, int employee_flag) throws ClassNotFoundException, SQLException {
-		this.name = name;
-		this.address = address;
-		this.town = town;
-		this.state = state;
-		this.zip = zip;
-		this.employee_flag = employee_flag;
-		this.numDevices = LocationQueries.numberDevices(id);
-		this.numEmployees = LocationQueries.numberEmployees(id);
+		this.employee_flag = flag;
+		this.lat = lat;
+		this.lng = lng;
 	}
 
 	/**
@@ -85,6 +64,8 @@ public String toString(){
 		sb.append("\"state\": \"").append(state).append("\"").append(comma);
 		sb.append("\"numDevices\":").append(numDevices).append(comma);
 		sb.append("\"numEmployees\":").append(numEmployees).append(comma);
+		sb.append("\"lat\": \"").append(lat).append("\"").append(comma);
+		sb.append("\"long\": \"").append(lng).append("\"").append(comma);
 		sb.append("\"zip\": \"").append(zip).append("\"");
 		sb.append("}");
 		return sb.toString();
@@ -139,4 +120,12 @@ public int getEmployeeFlag()
 	{
 		return employee_flag;
 	}	
+	
+	public String getLat(){
+		return lat;
+	}
+	
+	public String getLng(){
+		return lng;
+	}
 }