diff --git a/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java b/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java
index 1d262f9..bf6cbfc 100644
--- a/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java
+++ b/src/main/java/org/ntlab/nemophila/models/accounts/AccountManager.java
@@ -3,27 +3,44 @@
 import java.util.HashMap;
 import java.util.UUID;
 
-public class AccountManager<String> {
+public class AccountManager {
     private static AccountManager theInstance = null;
     private HashMap<String,Account> accountsMap = new HashMap<>();
+    private int newId = 57797;
+
+    private AccountManager() {
+
+    }
+
     public static AccountManager getInstance() {
         if(theInstance == null){
             theInstance = new AccountManager();
         }
         return theInstance;
     }
+
     public Account getAccount(String id){
         return accountsMap.get(id);
     }
-    public void createAccount(String name, String pw){
+
+    public Account createAccount(String name, String pw){
         UUID uuid = UUID.randomUUID();
-        String id = (String) uuid.toString();
-        Account ac = new Account();
+        String token = (String) uuid.toString();
+
+        Account ac = new Account(name, pw);
+        ac.setToken(token);
+        String id = Integer.toString(newId);
+        ac.setId(id);
+        newId++;
         accountsMap.put(id, ac);
-
-    }
-    public Account updateAccount(String id, String pw) {
-        return null;
+        return ac;
     }
 
+    public Account updateAccount(String id) {
+        Account ac = accountsMap.get(id);
+        UUID uuid = UUID.randomUUID();
+        String token = (String) uuid.toString();
+        ac.setToken(token);
+        return ac;
+    }
 }