diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index c16235b..eb2d7ae 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -43,4 +43,12 @@
 		token = RandomStringUtils.random(64, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
 		return token;
 	}
+
+	public Account getAccount(String token) {
+		if (this.token == token) {
+			return this;
+		} else {
+			return null;
+		}
+	}
 }
diff --git a/src/main/java/cactusServer/entities/Session.java b/src/main/java/cactusServer/entities/Session.java
new file mode 100644
index 0000000..b6d9fa1
--- /dev/null
+++ b/src/main/java/cactusServer/entities/Session.java
@@ -0,0 +1,31 @@
+package cactusServer.entities;
+
+import java.net.URI;
+
+import cactusServer.entities.Account;
+
+public class Session {
+	private Account account;
+	private URI accountURI;
+
+	public Session(Account account, URI accountURI) {
+		this.account = account;
+		this.accountURI = accountURI;
+	}
+
+	public Account getAccount() {
+		return account;
+	}
+
+	public void setAccount(Account account) {
+		this.account = account;
+	}
+
+	public URI getAccountURI() {
+		return accountURI;
+	}
+
+	public void setAccountURI(URI accountURI) {
+		this.accountURI = accountURI;
+	}
+}
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index d109b7a..b19c757 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -2,7 +2,7 @@
 
 import javax.inject.Singleton;
 
-import cactusServer.entities.Account;
+import cactusServer.entities.*;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -12,6 +12,7 @@
 	private static Accounts theInstance = null;
 	private HashMap<String, Account> accounts = new HashMap<>();
 	private HashSet<String> idSet = new HashSet<String>();
+	private Session session;
 
 	private Accounts() {
 
@@ -65,13 +66,8 @@
 		}
 	}
 
-	public String logoutAccount(String userID) {
-		if (idSet.contains(userID)) {
-			Accounts.getInstance().getAccount(userID).setLogin(false);
-			return "success";
-		} else {
-			return "failed";
-		}
+	public String logoutAccount(String token) {
+		return "";
 	}
 
 	public String deleteAccount(String userID) {
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index e3b5d2b..d9dd2d1 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -6,10 +6,9 @@
 import cactusServer.entities.Account;
 import cactusServer.models.Accounts;
 
-@Path("/AccountsRest")
+@Path("/accounts")
 public class AccountsRest {
-	@POST
-	@Path("/login")
+	@PUT
 	@Produces(MediaType.APPLICATION_JSON)
 	public Account loginAccount(@FormParam("userID") String userID, @FormParam("userPass") String userPass) {
 		return Accounts.getInstance().loginAccount(userID, userPass);
@@ -18,26 +17,17 @@
 	@POST
 	@Path("/logout")
 	@Produces(MediaType.TEXT_PLAIN)
-	public String logoutAccount(@FormParam("userID") String userID) {
-		return Accounts.getInstance().logoutAccount(userID);
+	public String logoutAccount(@FormParam("token") String token) {
+		return Accounts.getInstance().logoutAccount(token);
 	}
 
 	@POST
-	@Path("/createAccount")
 	@Produces(MediaType.APPLICATION_JSON)
 	public Account create(@FormParam("userID") String userID, @FormParam("userName") String userName,
 			@FormParam("userPass") String userPass) {
 		return Accounts.getInstance().createAcount(userID, userName, userPass);
 	}
 
-	@PUT
-	@Path("/updateAccount")
-	@Produces(MediaType.APPLICATION_JSON)
-	public Account updateAccount(@FormParam("userID") String userID, @FormParam("userName") String userName,
-			@FormParam("userPass") String userPass) {
-		return Accounts.getInstance().updateAccount(userID, userName, userPass);
-	}
-
 	@GET
 	@Path("/{userID}")
 	@Produces(MediaType.APPLICATION_JSON)
@@ -45,10 +35,4 @@
 		return Accounts.getInstance().getAccount(userID);
 	}
 
-	@DELETE
-	@Path("/deleteAccount")
-	@Produces(MediaType.TEXT_PLAIN)
-	public String deleteAccount(@FormParam("userID") String userID) {
-		return Accounts.getInstance().deleteAccount(userID);
-	}
 }