diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index aa51dc9..17b9f45 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -1,5 +1,7 @@
 package cactusServer.resources;
 
+import java.util.ArrayList;
+
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -13,9 +15,19 @@
 
 	@PUT
 	@Produces(MediaType.APPLICATION_JSON)
-	public Session loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
-		return Accounts.getInstance().loginAccount(userID, userPass);
+	public URIAddressedEntity loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
+		URIAddressedEntity session = Accounts.getInstance().loginAccount(userID, userPass);
+		if(session != null) {
+			return session;
+		}
+		else {
+			int status = 400;
+		
+		}
+		
 	}
+	
+
 
 	@POST
 	@Path("/logout")
@@ -26,7 +38,7 @@
 
 	@POST
 	@Produces(MediaType.APPLICATION_JSON)
-	public Session createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
+	public URIAddressedEntity createAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
 			@FormParam("userPass") String userPass) {
 		return Accounts.getInstance().createAcount(userID, userName, userPass);
 	}
@@ -39,10 +51,16 @@
 	}
 	
 	@DELETE
+	@Path("/{uniqueID}")
 	@Produces(MediaType.APPLICATION_JSON)
-	public Account deleteAccount(@FormParam("token") String token) {
-		return Accounts.getInstance().deleteAccount(token);
+	public Account deleteAccount(@FormParam("uniqueID") String uniqueID) {
+		return Accounts.getInstance().deleteAccount(uniqueID);
 	}
 	
+	@GET
+	@Produces(MediaType.APPLICATION_JSON)
+	public ArrayList<Account> getAccounts(){
+		return Accounts.getInstance().getAccounts();
+	}
 
 }