diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index c16235b..360ca81 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -43,4 +43,11 @@
 		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..ea596f1
--- /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 iaccount, URI iaccountURI) {
+		account = iaccount;
+		accountURI = iaccountURI;
+	}
+
+	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..453a9bf 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -18,8 +18,8 @@
 	@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