diff --git a/src/main/java/cactusServer/entities/Account.java b/src/main/java/cactusServer/entities/Account.java
index 431ced0..c006fa3 100644
--- a/src/main/java/cactusServer/entities/Account.java
+++ b/src/main/java/cactusServer/entities/Account.java
@@ -3,13 +3,10 @@
 public class Account {
 	private String id,name,pass;
 
-	public Account(String userId, String userName) {
+	public Account(String userId, String userName,String userPass) {
 		setId(userId);
 		setName(userName);
-	}
-
-	public Account() {
-
+		setPass(userPass);
 	}
 
 	public String getId() {
diff --git a/src/main/java/cactusServer/models/Accounts.java b/src/main/java/cactusServer/models/Accounts.java
index 1e7c3b0..8fcf2b4 100644
--- a/src/main/java/cactusServer/models/Accounts.java
+++ b/src/main/java/cactusServer/models/Accounts.java
@@ -9,7 +9,7 @@
 @Singleton
 public class Accounts {
 	private static Accounts theInstance = null;
-	private ArrayList<Account> accounts = new ArrayList<Account>();
+	private static ArrayList<Account> accounts = new ArrayList<Account>();
 
 	public Accounts() {
 		if (theInstance == null) {
@@ -24,10 +24,10 @@
 		return theInstance;
 	}
 
-	public Account createAcount(String userID,String userName) {
+	public static Account createAcount(String userID,String userName,String userPass) {
 		System.out.println(userName);
 
-		Account newAccount = new Account(userID, userName);
+		Account newAccount = new Account(userID, userName,userPass);
 		accounts.add(newAccount);
 
 		System.out.println(userID);
@@ -35,25 +35,19 @@
 		return newAccount;
 	}
 
-	public void createAccount(String userId) {
-		Account newAccount = new Account(userId, "user" + userId);
-		accounts.add(newAccount);
-		System.out.println(accounts.size());
-	}
-
 	public ArrayList<Account> getAccountList() {
 		return this.accounts;
 	}
 
-	public Account getAcount(String userID) {
-		Account editAccount = accounts.get(Integer.valueOf(userID));
+	public static Account getAccount(String userID) {
+		Account editAccount = null;
+		for(int i=0;i<accounts.size();i++) {
+			if(accounts.get(i).getId() == userID) {
+				editAccount = accounts.get(i);
+			}
+		}
 		return editAccount;
 	}
-
-	public Accounts getAccount() {
-		Account ac = new Account();
-		return new Accounts();
-	}
 	
 	public String deleteAccount(int userID) {
 		accounts.remove(userID);
@@ -64,8 +58,4 @@
 		return accounts;
 	}
 
-	public void setAccounts(ArrayList<Account> accounts) {
-		this.accounts = accounts;
-	}
-
 }
diff --git a/src/main/java/cactusServer/resources/AccountsRest.java b/src/main/java/cactusServer/resources/AccountsRest.java
index eb88533..52ce3a8 100644
--- a/src/main/java/cactusServer/resources/AccountsRest.java
+++ b/src/main/java/cactusServer/resources/AccountsRest.java
@@ -2,20 +2,38 @@
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
+
+import cactusServer.entities.Account;
 import cactusServer.models.Accounts;
 
-@Path("AccountsRest")
+@Path("/AccountsRest")
 public class AccountsRest {
 	@POST
 	@Path("/login")
 	@Produces(MediaType.APPLICATION_JSON)
-	public String loginAccount(String userID,String userPass) {
+	public String loginAccount(@QueryParam("userID") String userID, @QueryParam("userPass") String userPass) {
 		return "";
 	}
+
 	@POST
 	@Path("/logout")
 	@Produces(MediaType.APPLICATION_JSON)
-	public String logoutAccount(String userID,String userPass) {
+	public String logoutAccount(@QueryParam("userID") String userID) {
 		return "";
 	}
+
+	@POST
+	@Path("/createAccount")
+	@Produces(MediaType.APPLICATION_JSON)
+	public void create(@QueryParam("userID") String userID, @QueryParam("userName") String userName,
+			@QueryParam("userPass") String userPass) {
+		Accounts.createAcount(userID, userName, userPass);
+	}
+
+	@GET
+	@Path("/getAccount")
+	@Produces(MediaType.APPLICATION_JSON)
+	public Account getAccount(@QueryParam("userID") String userID) {
+		return Accounts.getAccount(userID);
+	}
 }