diff --git a/WebContent/html/css/stylesheet.css b/WebContent/html/css/stylesheet.css
index 65e94ad..96b77b9 100644
--- a/WebContent/html/css/stylesheet.css
+++ b/WebContent/html/css/stylesheet.css
@@ -75,6 +75,16 @@ input[type=text]{
     width: 60%;
 }
 
+input[type=tel]{
+    margin: 0 auto;
+    width: 60%;
+}
+
+input[type=number]{
+    margin: 0 auto;
+    width: 60%;
+}
+
 select{
     margin:0 auto;
     width: 65%;
diff --git a/WebContent/html/webpages/adminLocation.jsp b/WebContent/html/webpages/adminLocation.jsp
index 573f6aa..dab61a5 100644
--- a/WebContent/html/webpages/adminLocation.jsp
+++ b/WebContent/html/webpages/adminLocation.jsp
@@ -36,59 +36,9 @@
       background-color: #E9EAEB;
     }
 
-    div.deviceContainer{
-      border: solid; 
-      border-width: thin; 
-      padding: 15px;
-      background-color: #E9EAEB;
-      display: inline-block;
-      cursor: pointer;
-      position: relative;
-    }
-
-    div.imgContainer{
-      display: inline-block; 
-      text-align: center;
-    }
-
-    div.returnButtonContainer{
-      text-align: right;
-    }
-
-    img.device{
-      display: block;
-    }
-    div.returnConfirm{
-      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;
-    }
-    div.deviceInfo{
-      display: inline-block; 
-      vertical-align: top;
-      padding-top: 15px; 
-      padding-left: 20px;
-      width: 200px; 
-    }
     tbody{
       text-align: left;
     }
-    input.deviceCheckbox{
-    	position: absolute;
-    	left: 0px;
-    	bottom: 0px;
-    	height: 20px;
-    	width: 20px;
-    }
   </style>
   <!-- Header -->
   <nav class="navbar navbar-inverse navbar-fixed-top" id = "navbaruniversal">
diff --git a/WebContent/html/webpages/orderFormHandler.jsp b/WebContent/html/webpages/orderFormHandler.jsp
index ea3291d..aee91c6 100644
--- a/WebContent/html/webpages/orderFormHandler.jsp
+++ b/WebContent/html/webpages/orderFormHandler.jsp
@@ -12,6 +12,12 @@ pageEncoding="ISO-8859-1"%>
 <script type="text/javascript">
 <%
 MySQLAccess access = new MySQLAccess();
+Cookie[] cookies = request.getCookies();
+int sso = 0;
+for(Cookie c : cookies)
+{
+	if(c.getName().equals("ssoNum")) sso = Integer.parseInt(c.getValue());
+}
 
 
 // If location id is 0, it is a custom location which must be added to the database before employee preffered location can be updated
@@ -19,11 +25,12 @@ int location=-1;
 if(Integer.parseInt(request.getParameter("location_dropdown"))==0)
 {
 	location = access.addLocation(
-		"placeholder",
+			request.getParameter("locname"),
 			request.getParameter("state"),
 			request.getParameter("address"),
-			request.getParameter("town"),
-			Integer.parseInt(request.getParameter("zip"))
+			request.getParameter("city"),
+			request.getParameter("zip"),
+			sso
 		);
 }
 
@@ -32,7 +39,7 @@ String userName = request.getParameter("name");
 String phone = request.getParameter("phone");
 // read location ID, but only if we haven't already generated it when adding new location to db
 if(location==-1){ location = Integer.parseInt(request.getParameter("location_dropdown"));}
-access.updateEmployee(1, userName, phone, location); //TODO get ID somehow
+access.updateEmployee(sso, userName, phone, location);
 System.out.print("updated employee "+userName);
 
 // And now for the ticket
@@ -53,7 +60,7 @@ for(int i=0; i<idStringArray.length; i++)
 // Now just call generateTicket once for each device
 for(int i=0; i<devIDs.length; i++)
 {
-	access.generateTicket(1, location, devIDs[i], request.getParameter("timeNeeded"));//TODO get ID somehow
+	access.generateTicket(sso, location, devIDs[i], request.getParameter("timeNeeded"));//TODO get ID somehow
 }
 
 %>
diff --git a/WebContent/html/webpages/shoppingCart.jsp b/WebContent/html/webpages/shoppingCart.jsp
index 1bb89c3..7649ec2 100644
--- a/WebContent/html/webpages/shoppingCart.jsp
+++ b/WebContent/html/webpages/shoppingCart.jsp
@@ -6,6 +6,16 @@ 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">
+
+<%
+Cookie[] cookies = request.getCookies();
+int sso = 0;
+for(Cookie c : cookies)
+    {
+if(c.getName().equals("ssoNum")) sso = Integer.parseInt(c.getValue());
+}
+%>
+
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -66,59 +76,116 @@ pageEncoding="ISO-8859-1"%>
                     <input type="text" name="deviceIDs" style="display: none;">            
                     <div class="form-group row">
                         <label for="name">Your name</label><br/>
-                        <input type="text" class="form-control" name="name" placeholder="Name" />
+                        <input type="text" class="form-control" name="name" placeholder="Name"  required>
                     </div>
                     <div class="form-group row">
                         <label for="phone">Phone Number</label><br/>
-                        <input type="text" class="form-control" name="phone" placeholder="203-867-5309">
+                        <input type="tel" class="form-control" name="phone" placeholder="203-867-5309" style="margin: 0 auto; width:60%" required>
                     </div>
                     
                     <div class="form-group">
                         <label for="location_dropdown">Place to ship to</label><br/>
-                        <select class="form-control" name="location_dropdown" id="dropdown" onchange="forceUpdateLocationMetadata()" style="width:65%; max-height: 80%; text-align: center; vertical-align: center; align-items: center; display: block; position: relative; margin: 5% auto;">
+                        <select class="form-control" name="location_dropdown" id="dropdown" onchange="forceUpdateLocationMetadata()" style="width:65%; max-height: 80%; text-align: center; vertical-align: center; align-items: center; display: block; position: relative; margin: 0% auto; text-align-last:center; padding:">
                         </select>
                     </div>
-                    <div class="form-group row" style="display: block; align-items: center;margin: 5% auto;">
+                    <div class="form-group-row">
+                        <label for="">Location Name</label>
+                        <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="locname" style="width: 50%" placeholder="Give your new location a name!" readonly required/>
+                    </div>
+                    <div class="form-group row" style="display: block; align-items: center;margin: 3% auto;">
                         <div class="col-md-6" style="width:50%">
                             <div class="form-group row">
                                 <label for="address">Street Address</label>                        
-                                <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="address" placeholder="Address"/>
+                                <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="address" placeholder="Address" required/>
                             </div>
                             <div class="form-group row">
                                 <label for="city">City</label>                            
-                                <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="city" placeholder="City"/>
+                                <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="city" placeholder="City" required/>
                             </div>
                         </div>
                         <div class="col-md-6" style="width:50%">
                             <div class="form-group row">
                                 <label for="state">State</label>                            
-                                <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="state" placeholder="State"/>
-                            </div>
-                            <div class="form-group row">
-                                <label for="zip">Zip</label>                            
-                                <input type="text" onkeyup="forceDropdownCustomLocation" class="form-control" name="zip" placeholder="Zip Code"/>
-                            </div>
+                                <select required style = "width: 60%; text-align-last:center;" name = "state" class="form-control">
+                                  <option value="" disabled selected>Choose State</option>
+                                  <option value="AL">Alabama</option>
+                                  <option value="AK">Alaska</option>
+                                  <option value="AZ">Arizona</option>
+                                  <option value="AR">Arkansas</option>
+                                  <option value="CA">California</option>
+                                  <option value="CO">Colorado</option>
+                                  <option value="CT">Connecticut</option>
+                                  <option value="DE">Delaware</option>
+                                  <option value="DC">District Of Columbia</option>
+                                  <option value="FL">Florida</option>
+                                  <option value="GA">Georgia</option>
+                                  <option value="HI">Hawaii</option>
+                                  <option value="ID">Idaho</option>
+                                  <option value="IL">Illinois</option>
+                                  <option value="IN">Indiana</option>
+                                  <option value="IA">Iowa</option>
+                                  <option value="KS">Kansas</option>
+                                  <option value="KY">Kentucky</option>
+                                  <option value="LA">Louisiana</option>
+                                  <option value="ME">Maine</option>
+                                  <option value="MD">Maryland</option>
+                                  <option value="MA">Massachusetts</option>
+                                  <option value="MI">Michigan</option>
+                                  <option value="MN">Minnesota</option>
+                                  <option value="MS">Mississippi</option>
+                                  <option value="MO">Missouri</option>
+                                  <option value="MT">Montana</option>
+                                  <option value="NE">Nebraska</option>
+                                  <option value="NV">Nevada</option>
+                                  <option value="NH">New Hampshire</option>
+                                  <option value="NJ">New Jersey</option>
+                                  <option value="NM">New Mexico</option>
+                                  <option value="NY">New York</option>
+                                  <option value="NC">North Carolina</option>
+                                  <option value="ND">North Dakota</option>
+                                  <option value="OH">Ohio</option>
+                                  <option value="OK">Oklahoma</option>
+                                  <option value="OR">Oregon</option>
+                                  <option value="PA">Pennsylvania</option>
+                                  <option value="RI">Rhode Island</option>
+                                  <option value="SC">South Carolina</option>
+                                  <option value="SD">South Dakota</option>
+                                  <option value="TN">Tennessee</option>
+                                  <option value="TX">Texas</option>
+                                  <option value="UT">Utah</option>
+                                  <option value="VT">Vermont</option>
+                                  <option value="VA">Virginia</option>
+                                  <option value="WA">Washington</option>
+                                  <option value="WV">West Virginia</option>
+                                  <option value="WI">Wisconsin</option>
+                                  <option value="WY">Wyoming</option>
+                              </select>
+                          </div>
+                          <div class="form-group row">
+                            <label for="zip">Zip</label>                            
+                            <input type="number" onkeyup="forceDropdownCustomLocation" class="form-control" name="zip" placeholder="Zip Code" style="margin: 0 auto; width:60%" required/>
                         </div>
                     </div>
-                    <div class="form-group row">
-                        <label for="timeNeeded">How long you think you'll need it?</label><br/>
-                        <input type="date" class="form-control" name="timeNeeded" style="40%" />
-                    </div>
-                    <button type="submit" class="btn btn-primary" name="Submit">Submit</button>
-                </form>
-            </div>
-
+                </div>
+                <div class="form-group row">
+                    <label for="timeNeeded">When will you be able to return it?</label><br/>
+                    <input type="date" class="form-control" name="timeNeeded" style="width:20%; margin:0% auto" required/>
+                </div>
+                <button type="submit" class="btn btn-primary" name="Submit">Submit</button>
+            </form>
         </div>
+
     </div>
+</div>
 
-    <div class="col-sm-3 col-md-2 sidebar">
-      <ul class="nav nav-sidebar">
-        <h4>Shopping Cart Options</h4>
-        <li class = "option" id = "os"><a href="#">Order Selected</a></li>
-        <li class = "option" id = "ds"><a href="#">Remove Selected From Cart</a></li>
-        <li class = "option" id = "oa"><a href="#">Order All</a></li>
-        <li class = "option" id = "da"><a href="#">Remove All From Cart</a></li>
-    </ul>
+<div class="col-sm-3 col-md-2 sidebar">
+  <ul class="nav nav-sidebar">
+    <h4>Shopping Cart Options</h4>
+    <li class = "option" id = "os"><a href="#">Order Selected</a></li>
+    <li class = "option" id = "ds"><a href="#">Remove Selected From Cart</a></li>
+    <li class = "option" id = "oa"><a href="#">Order All</a></li>
+    <li class = "option" id = "da"><a href="#">Remove All From Cart</a></li>
+</ul>
 </div>
 
 <div class = "displayDevice">
@@ -131,7 +198,7 @@ pageEncoding="ISO-8859-1"%>
 <!-- <script src = "../javascript/navbar.js"></script> -->
 <script src = "../javascript/nhpup_1.1.js"></script>
 <script type="text/javascript">
-//adding event listeners to all the options, such as ordering and deleting
+// adding event listeners to all the options, such as ordering and deleting
 document.getElementById('os').addEventListener('click',orderSelected_showPopup);
 document.getElementById('ds').addEventListener('click',deleteSelected);
 document.getElementById('oa').addEventListener('click',orderAll_showPopup);
@@ -198,7 +265,7 @@ function show(){
     if(cart.length !== 0){                                                  //only continue if there are cart items
         html += '<p>Tickets have been generated below based on your desired selections.</p><br>'
         for(var i = 0; i < cart.length; i++){                               //iterate cart
-            var id = cart[i].id;                                               //this gets the id value from the cart
+            var id = cart[i].id;                                            //this gets the id value from the cart
                     html += '<div> <input class = "deviceCheckbox" type = "checkbox" id = "' + id + '"> </input><a class = "divlink" href = "#" onmouseover = "'+ part1 + 'Hardware type: ' + cart[i].hardware + '<br><br>' + cart[i].description + part2 + '"><div id = "ticket' + id +'" class = "ticket"><p class = "tickettext">' + cart[i].name + '</p></div></a></div>'; //create listing of all the devices
                 }
             }
@@ -282,7 +349,7 @@ function autoFillFields(orderAllBool) {
     // get employee
     <%
     MySQLAccess access = new MySQLAccess();
-    User employee = access.getEmployeeByID(9);  //replace with real ID
+    User employee = access.getEmployeeByID(sso);
     int locationID = employee.getLocation();
     String name = employee.getName();
     String phone = employee.getPhone();    
@@ -304,6 +371,18 @@ function autoFillFields(orderAllBool) {
     forceUpdateLocationMetadata();
     // finally mark hidden orderAll field appropriately
     document.orderForm.orderAll.value=orderAllBool;
+
+    // Also, this is where I'm going to restrict the date input to the future
+    var dtToday = new Date();
+    var month = dtToday.getMonth() + 1;
+    var day = dtToday.getDate();
+    var year = dtToday.getFullYear();
+    if(month < 10)
+        month = '0' + month.toString();
+    if(day < 10)
+        day = '0' + day.toString();
+    var minDate = year + '-' + month + '-' + day;    
+    document.orderForm.timeNeeded.min=minDate;
 }
 
 // Set all the shipping fields to the database values correspoding to the location selected in the dropdown
@@ -313,22 +392,34 @@ function forceUpdateLocationMetadata() {
     for (var i = locations.length - 1; i >= 0; i--) {
         if(locations[i].id==selectedLocID) selectedLocation=locations[i];
     }
-    if(selectedLocID!=-1)       //-1 is the 'new location' option
+    if(selectedLocID!=0)       //0 is the 'new location' option
     {
+        document.orderForm.locname.value = selectedLocation.name;
         document.orderForm.address.value = selectedLocation.address;
         document.orderForm.city.value = selectedLocation.town;
         document.orderForm.state.value = selectedLocation.state;
         document.orderForm.zip.value = selectedLocation.zip;
+        // if we're force updating metadata, it means we don't want the name to be editable
+        document.orderForm.locname.readOnly=true;
     }
+    else document.orderForm.locname.readOnly=false; //Should be editable with new location though
+
+    
 }
 
 function forceDropdownCustomLocation() {
-    $("#dropdown option[value='0']").attr("selected",true);
+    document.orderForm.location_dropdown.selectedIndex=0;
+    document.orderForm.locname.value="";
+    document.orderForm.locname.readOnly=false; //let user edit name since they're making new location
 }
 
 function getLocations() {
     <%
-    Location[] loci = access.getLocations(9); //TODO get real ID
+    Location[] loci = access.getLocations(sso);
+    for(int i=0; i<loci.length; i++)
+    {
+        System.out.println(loci[i].getName());
+    }
     %>
     var loci = new Array(<%=loci.length%>);
     <%
@@ -352,6 +443,7 @@ function getLocations() {
 function submitOrderForm() {
     // This is called just before order form is submitted. In order for any database activity to occur,
     // we must first append the employees ID as well as the ids of whatever devices are selected.
+
     // First, employee id
     userID=getUserID();
     document.orderForm.userID.value=userID;
@@ -363,29 +455,24 @@ function submitOrderForm() {
     document.orderForm.deviceIDs.value=selectedDeviceString;
 
     // Finally remove selected items from the cart
-    var cart = getCartItems();
-    for(var i = 0; i < checked.length; i++){                                    //iterate all the checked off devices
-            for(var j = 0; j < cart.length; j++){                               //iterate cart
-                if(cart[j] == checked[i])                                               //match id's
-                    cart.splice(j,1);                                           //remove from the cart
-            }
-        }
-    // And clear the checked array
-    checked=new Array();
+    deleteSelected(false);
     return true;
 }
 
 /**
 This function takes all the devices we selected and removes them from the shopping cart.
+Prompt is a boolean.
 **/
-function deleteSelected(){
-    var response = confirm("Are you sure you'd like to remove the selected items from the cart?");
-    if(response == true){                                           //if they confirm
+function deleteSelected() {deleteSelected(true);} //this should handle call from delete selected button
+function deleteSelected(prompt){
+    var confirmDelete = prompt ? confirm("Are you sure you'd like to remove the selected items from the cart?") : true
+
+    if(confirmDelete){                                              //if they confirm
         for(var i = 0; i < checked.length; i++){                    //iterate all the checked off devices
             var id = checked[i];                                    //get the id of each device
             var cart = getCartItems();                              //get the cart
             for(var j = 0; j < cart.length; j++){                   //iterate cart
-                if(cart[j] == id){                                  //match ids
+                if(cart[j].id == id){                               //match ids
                     cart.splice(j,1);                               //remove from the cart
                 }
             }
@@ -431,7 +518,7 @@ function deleteAll(){
 }
 
 function getUserID() {
-    return 9;       //TODO actually get a userID
+    return <%=sso%>;
 }
 function debug_add_items_to_cart() {
     employee.id=5;
diff --git a/src/database/MySQLAccess.java b/src/database/MySQLAccess.java
index 60c816f..c2e5fd0 100644
--- a/src/database/MySQLAccess.java
+++ b/src/database/MySQLAccess.java
@@ -14,7 +14,7 @@ public class MySQLAccess {
 	String user = "b372dfe7409692";
 	String password = "74f6e317";
 	String[][] result = new String[20][3];
-	
+
 	public Statement connectDB() throws SQLException, ClassNotFoundException {
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connect = DriverManager.getConnection(database, user, password);
@@ -101,9 +101,9 @@ public String locationIntToString(int locInt) throws ClassNotFoundException, SQL
 	}
 
 	// returns ID of new location
-	public int addLocation(String name, String state, String address, String town, int zip) throws SQLException, ClassNotFoundException
+	public 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));
+		return addLocation(new Location(name, address, town, state, zip, userID));
 	}
 
 	// returns ID of new location
@@ -122,7 +122,8 @@ public int addLocation(Location location) throws SQLException, ClassNotFoundExce
 			id = results.getInt("Location_ID");
 			id++;
 			//tries this statement, otherwise tries again with a new id
-			i = stmt.executeUpdate("INSERT INTO location (Location_ID,Name,Address,Town,State,Zip_Code) VALUES (" + id +",\"" + location.getName() + "\",\"" + location.getAddress()+ "\",\"" + location.getTown() + "\",\"" + location.getState() + "\",\"" + location.getZip()+ "\")");
+			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()  + ")");
 		}
 		stmt.close();
 		connect.close();
@@ -161,7 +162,7 @@ public Location[] getLocations() throws ClassNotFoundException, SQLException{
 
 	public Location[] getLocations(int userID) throws SQLException, ClassNotFoundException
 	{
-		String query = "SELECT * FROM location WHERE Employee_Flag = 0 OR Employee_Flag = "+userID; //TODO filter for custom locations (needs db change)
+		String query = "SELECT * FROM location WHERE Employee_Flag = 0 OR Employee_Flag = "+userID+" ORDER BY Name ASC"; //TODO filter for custom locations (needs db change)
 		Class.forName("com.mysql.jdbc.Driver");
 		Connection connect = DriverManager.getConnection(database,user,password);
 		Statement statement = connect.createStatement();
diff --git a/src/entities/Location.java b/src/entities/Location.java
index 91fe562..a2a19d8 100644
--- a/src/entities/Location.java
+++ b/src/entities/Location.java
@@ -12,6 +12,7 @@ public class Location {
 	private String town;
 	private String state;
 	private String zip;
+	private int employee_flag;
 	
 	/**
 	 * Constructor for existing location.
@@ -46,6 +47,15 @@ public Location(String name, String address, String town, String state, String z
 		this.zip = zip;
 	}
 	
+	public Location(String name, String address, String town, String state, String zip, int employee_flag) {
+		this.name = name;
+		this.address = address;
+		this.town = town;
+		this.state = state;
+		this.zip = zip;
+		this.employee_flag = employee_flag;
+	}
+
 	/**
 	 * Make JSON representation of location.
 	 */
@@ -103,5 +113,13 @@ public String getState(){
 	public String getZip(){
 		return zip;
 	}
+	public void setEmployeeFlag(int ID)
+	{
+		employee_flag=ID;
+	}
+	public int getEmployeeFlag()
+	{
+		return employee_flag;
+	}
 	
 }