diff --git a/src/clients/StudentClient.java b/src/clients/StudentClient.java
index f1670ca..c6eced3 100644
--- a/src/clients/StudentClient.java
+++ b/src/clients/StudentClient.java
@@ -15,6 +15,7 @@
 import java.util.logging.Logger;
 import javax.swing.JOptionPane;
 import network.MessageGenerator;
+import network.MessageType;
 import network.jms.RequestSender;
 
 /*
@@ -87,11 +88,11 @@
 
 
 			// find server IP (uses network multicast)
-			final Collection<String> activeServers = new ServiceLocator().getActiveServers();
+			final Collection<Lab> activeLabs = new ServiceLocator().getActiveLabs();
 
-			final Lab lab = (Lab) JOptionPane.showInputDialog(null, "Which lab?", "Which lab?", JOptionPane.QUESTION_MESSAGE, null, activeServers.toArray(), currentLab);
+			final Lab lab = (Lab) JOptionPane.showInputDialog(null, "Which lab?", "Which lab?", JOptionPane.QUESTION_MESSAGE, null, activeLabs.toArray(), currentLab);
 
-			String labName="";
+			String labName=null;
 			
 			if (lab == null) {
 				System.exit(0);
@@ -103,7 +104,7 @@
 
 //         this.systemTrayIcon.displayMessage("Yay", "Server found: "  +serverIp, TrayIcon.MessageType.INFO);
 
-			this.requestSender = new RequestSender(labName, machineId);
+			this.requestSender = new RequestSender(lab, machineId);
 
 		} catch (ServiceNotFoundException ex) {
 			this.systemTrayIcon.displayMessage("Whoops", "Could not connect to server.  Please try again and let the supervisor know if it continues to happen.", TrayIcon.MessageType.ERROR);
@@ -122,6 +123,7 @@
 			final MenuItem requestHelp = new MenuItem("Request Help");
 			requestHelp.addActionListener(new ActionListener() {
 
+				@Override
 				public void actionPerformed(final ActionEvent e) {
 					helpRequest();
 				}
@@ -130,6 +132,7 @@
 			final MenuItem requestMarking = new MenuItem("Request Marking");
 			requestMarking.addActionListener(new ActionListener() {
 
+				@Override
 				public void actionPerformed(final ActionEvent e) {
 					markingRequest();
 				}
@@ -138,6 +141,7 @@
 			final MenuItem cancelHelp = new MenuItem("Cancel Help");
 			cancelHelp.addActionListener(new ActionListener() {
 
+				@Override
 				public void actionPerformed(final ActionEvent e) {
 					cancelHelp();
 				}
@@ -146,6 +150,7 @@
 			final MenuItem cancelMarking = new MenuItem("Cancel Marking");
 			cancelMarking.addActionListener(new ActionListener() {
 
+				@Override
 				public void actionPerformed(final ActionEvent e) {
 					cancelMarking();
 				}
@@ -154,6 +159,7 @@
 			final MenuItem cancelAll = new MenuItem("Cancel All Requests");
 			cancelAll.addActionListener(new ActionListener() {
 
+				@Override
 				public void actionPerformed(final ActionEvent e) {
 					cancelAll();
 				}
@@ -162,6 +168,7 @@
 			final MenuItem exit = new MenuItem("Exit");
 			exit.addActionListener(new ActionListener() {
 
+				@Override
 				public void actionPerformed(final ActionEvent e) {
 					exit();
 				}
@@ -186,7 +193,7 @@
 
 	private void helpRequest() {
 		try {
-			requestSender.sendRequest(generator.requestHelp(machineId));
+			requestSender.sendRequest(MessageType.HELP);
 			systemTrayIcon.displayMessage("Help is on the way", "Your request is now in the queue.", TrayIcon.MessageType.INFO);
 		} catch (Exception ex) {
 			systemTrayIcon.displayMessage("Whoops", "Failed to make request", TrayIcon.MessageType.ERROR);
@@ -196,7 +203,7 @@
 
 	private void markingRequest() {
 		try {
-			requestSender.sendRequest(generator.requestMarking(machineId));
+			requestSender.sendRequest(MessageType.MARKING);
 			systemTrayIcon.displayMessage("Help is on the way", "Your request is now in the queue.", TrayIcon.MessageType.INFO);
 		} catch (Exception ex) {
 			systemTrayIcon.displayMessage("Whoops", "Failed to make request", TrayIcon.MessageType.ERROR);
@@ -205,34 +212,34 @@
 	}
 
 	private void cancelHelp() {
-		try {
-			requestSender.sendRequest(generator.cancelHelp(machineId));
-			systemTrayIcon.displayMessage("Request removed", "Your request has been removed from the queue.", TrayIcon.MessageType.INFO);
-		} catch (Exception ex) {
-			systemTrayIcon.displayMessage("Whoops", "Failed to make request", TrayIcon.MessageType.ERROR);
-			LOG.log(Level.SEVERE, "Error making request", ex);
-		}
+//		try {
+//			requestSender.sendRequest(generator.cancelHelp(machineId));
+//			systemTrayIcon.displayMessage("Request removed", "Your request has been removed from the queue.", TrayIcon.MessageType.INFO);
+//		} catch (Exception ex) {
+//			systemTrayIcon.displayMessage("Whoops", "Failed to make request", TrayIcon.MessageType.ERROR);
+//			LOG.log(Level.SEVERE, "Error making request", ex);
+//		}
 	}
 
 	private void cancelMarking() {
-		try {
-			requestSender.sendRequest(generator.cancelMarking(machineId));
-			systemTrayIcon.displayMessage("Request removed", "Your request has been removed from the queue.", TrayIcon.MessageType.INFO);
-		} catch (Exception ex) {
-			systemTrayIcon.displayMessage("Whoops", "Failed to cancel request", TrayIcon.MessageType.ERROR);
-			LOG.log(Level.SEVERE, "Error cancelling request", ex);
-		}
+//		try {
+//			requestSender.sendRequest(generator.cancelMarking(machineId));
+//			systemTrayIcon.displayMessage("Request removed", "Your request has been removed from the queue.", TrayIcon.MessageType.INFO);
+//		} catch (Exception ex) {
+//			systemTrayIcon.displayMessage("Whoops", "Failed to cancel request", TrayIcon.MessageType.ERROR);
+//			LOG.log(Level.SEVERE, "Error cancelling request", ex);
+//		}
 	}
 
 	private void cancelAll() {
-		try {
-			requestSender.sendRequest(generator.cancelHelp(machineId));
-			requestSender.sendRequest(generator.cancelMarking(machineId));
-			systemTrayIcon.displayMessage("All requests removeds", "All of your request have been removed from the queues.", TrayIcon.MessageType.INFO);
-		} catch (Exception ex) {
-			systemTrayIcon.displayMessage("Whoops", "Failed to cancel request", TrayIcon.MessageType.ERROR);
-			LOG.log(Level.SEVERE, "Error cancelling request", ex);
-		}
+//		try {
+//			requestSender.sendRequest(generator.cancelHelp(machineId));
+//			requestSender.sendRequest(generator.cancelMarking(machineId));
+//			systemTrayIcon.displayMessage("All requests removeds", "All of your request have been removed from the queues.", TrayIcon.MessageType.INFO);
+//		} catch (Exception ex) {
+//			systemTrayIcon.displayMessage("Whoops", "Failed to cancel request", TrayIcon.MessageType.ERROR);
+//			LOG.log(Level.SEVERE, "Error cancelling request", ex);
+//		}
 	}
 
 	private void exit() {