diff --git a/app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java b/app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java
index a1260c8..f406770 100644
--- a/app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java
+++ b/app/src/main/java/com/example/citrusclient/viewmodels/BooksViewModel.java
@@ -7,6 +7,7 @@
 import com.example.citrusclient.rest.BooksRest;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import retrofit2.Call;
 import retrofit2.Callback;
@@ -20,7 +21,7 @@
 
     private final BooksRest booksRest;
 
-    private final MutableLiveData<ArrayList<Book>> booksLiveData;
+    private final MutableLiveData<HashMap<Integer, Book>> booksLiveData;
 
     private final MutableLiveData<String> titleLiveData;
 
@@ -49,18 +50,16 @@
         this.delBookErrorLivedata = new MutableLiveData<>();
     }
 
-    //public MutableLiveData<Book> getBookLiveData() { return bookLiveData;}
+    public MutableLiveData<HashMap<Integer, Book>> getBookLiveData() { return this.booksLiveData;}
 
-    public MutableLiveData<Boolean> getSuccessDeleteBookLiveData() {
-        return successDeleteBookLiveData;
-    }
+    public MutableLiveData<Boolean> getSuccessDeleteBookLiveData() {return successDeleteBookLiveData;}
 
-    /*public void createBook(String accountId, String token , String title, String color, Boolean publicity){
-        Call<String> call = booksRest.createBook(accountId, token , title, color, publicity);
+    public void createBook(String accountId, String title, String color, Boolean publicity, String token ){
+        Call<Book> call = booksRest.createBook(accountId , title, color, publicity, token);
 
-            call.enqueue(new Callback<String>() {
+            call.enqueue(new Callback<Book>() {
                 @Override
-                public  void onResponse(Call<String> call, Response<String> response) {
+                public  void onResponse(Call<Book> call, Response<Book> response) {
                     if(response.isSuccessful()) {
                         System.out.println("success!" + response.body());
                     }else {
@@ -70,38 +69,45 @@
                 }
 
                 @Override
-                public void onFailure(Call<String> call, Throwable t) {
+                public void onFailure(Call<Book> call, Throwable t) {
 
                 }
             });
 
-    }*/
-
-    public void loadBooks(String account_id, String token){
-//        Call<ArrayList<Book>> call = booksRest.getBooks(account_id);
-//
-//        call.enqueue(new Callback<ArrayList<Book>>() {
-//            @Override
-//            public void onResponse(Call<ArrayList<Book>> call, Response<ArrayList<Book>> response) {
-//                if (response.isSuccessful()) {
-//                    ArrayList<Book> book = response.body();
-//                    //for()
-//                }
-//            }
-//
-//            @Override
-//            public void onFailure(Call<ArrayList<Book>> call, Throwable t) {
-//
-//            }
-//        });
     }
 
-    /*public void deleteBook(String account_id, Integer book_id, String token){
-        Call<ArrayList<Book>> call = booksRest.deleteBook(account_id, book_id, token);
+    public void loadBooks(String account_id, String token){
+        Call<HashMap<Integer, Book>> call = booksRest.getBooks(account_id, token);
 
-        call.enqueue(new Callback<Void>() {
+        call.enqueue(new Callback<HashMap<Integer, Book>>() {
             @Override
-            public void onResponse(Call<Void> call, Response<Void> response) {
+            public void onResponse(Call<HashMap<Integer, Book>> call, Response<HashMap<Integer, Book>> response) {
+                if (response.isSuccessful()) {
+                    HashMap<Integer, Book> book = response.body();
+                    booksLiveData.setValue(book);
+                }
+            }
+
+            @Override
+            public void onFailure(Call<HashMap<Integer, Book>> call, Throwable t) {
+
+            }
+        });
+    }
+//    private void setBooksLiveData(HashMap<Integer, Book> bookall){
+//        HashMap<Integer, Book> books = new HashMap<>();
+//        for(int i = 0; bookall.get(i).keySet().equals(null); i++){
+//
+//        }
+//        booksLiveData.setValue(books);
+//    }
+
+    public void deleteBook(String account_id, Integer book_id, String token){
+        Call<String> call = booksRest.deleteBook(account_id, book_id, token);
+
+        call.enqueue(new Callback<String>() {
+            @Override
+            public void onResponse(Call<String> call, Response<String> response) {
                 if (response.isSuccessful()) {
                     deleteBookLiveData(account_id, book_id);
                     System.out.println("DELETE");
@@ -111,23 +117,23 @@
             }
 
             @Override
-            public void onFailure(Call<Void> call, Throwable t) {
+            public void onFailure(Call<String> call, Throwable t) {
                 System.out.println("correspondence error" + t);
             }
         });
-    }*/
+    }
 
     private void deleteBookLiveData(String account_id, Integer book_id) {
         ArrayList<Book> delData = new ArrayList<>();
 
     }
 
-    /*public void setTitle(String account_id, Integer book_id, String title, String token){
-        Call<Void> call = booksRest.setTitle(account_id, book_id, title, token);
+    public void setTitle(String account_id, Integer book_id, String title, String token){
+        Call<String> call = booksRest.putTitle(account_id, book_id, title, token);
 
-        call.enqueue(new Callback<Void>() {
+        call.enqueue(new Callback<String>() {
             @Override
-            public void onResponse(Call<Void> call, Response<Void> response) {
+            public void onResponse(Call<String> call, Response<String> response) {
                 if (response.isSuccessful()){
                     titleLiveData.setValue(title);
                     System.out.println(response.code());
@@ -138,18 +144,18 @@
             }
 
             @Override
-            public void onFailure(Call<Void> call, Throwable t) {
+            public void onFailure(Call<String> call, Throwable t) {
                 System.out.println("NetWorkError" + t);
             }
         });
     }
 
     public void setColor(String account_id, Integer book_id, String color, String token){
-        Call<Void> call = booksRest.setColor(account_id, book_id, color, token);
+        Call<String> call = booksRest.putColor(account_id, book_id, color, token);
 
-        call.enqueue(new Callback<Void>() {
+        call.enqueue(new Callback<String>() {
             @Override
-            public void onResponse(Call<Void> call, Response<Void> response) {
+            public void onResponse(Call<String> call, Response<String> response) {
                 if (response.isSuccessful()){
                     colorLiveData.setValue(color);
                     System.out.println(response.code());
@@ -160,20 +166,21 @@
             }
 
             @Override
-            public void onFailure(Call<Void> call, Throwable t) {
+            public void onFailure(Call<String> call, Throwable t) {
                 System.out.println("NetWorkError" + t);
             }
         });
     }
 
-    public void setPublicity(String account_id, Integer book_id, String publicity, String token){
-        Call<Void> call = booksRest.setpublicity(account_id, book_id, publicity, token);
+    public void setPublicity(String account_id, Integer book_id, Boolean publicity, String token){
+        Call<String> call = booksRest.putPublicity(account_id, book_id, publicity, token);
 
-        call.enqueue(new Callback<Void>() {
+        call.enqueue(new Callback<String>() {
             @Override
-            public void onResponse(Call<Void> call, Response<Void> response) {
+            public void onResponse(Call<String> call, Response<String> response) {
                 if (response.isSuccessful()){
-                    publicityLiveData.setValue(publicity);
+                    String pub = String.valueOf(publicity);
+                    publicityLiveData.setValue(pub);
                     System.out.println(response.code());
                     System.out.println("Success SetTiTle" + publicity);
                 } else {
@@ -182,28 +189,28 @@
             }
 
             @Override
-            public void onFailure(Call<Void> call, Throwable t) {
+            public void onFailure(Call<String> call, Throwable t) {
                 System.out.println("NetWorkError" + t);
             }
         });
-    }*/
+    }
 
     private String parseStatusCode(Integer code) {
         switch (code) {
             case 404:
                 System.out.println("見つかりませんでした");
                 return null;
-            /*case 401:
-                System.out.println("見つかりませんでした");
-                return ErrorType.InvalidToken.getText();
+            case 401:
+                System.out.println("トークンが違います");
+                return null;
             case 400:
-                System.out.println("見つかりませんでした");
-                return ErrorType.ResponseError.getText();
+                System.out.println("レスポンスエラー");
+                return null;
             case 500:
-                System.out.println("見つかりませんでした");
-                return ErrorType.ServerError.getText();*/
+                System.out.println("サーバーエラー");
+                return null;
             default:
-                System.out.println("見つかりませんでした");
+                System.out.println("不明なエラー");
                 return null;
         }
     }