diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Comment.java b/src/main/java/org/ntlab/amaryllis/server/entities/Comment.java
new file mode 100644
index 0000000..8deb43d
--- /dev/null
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/Comment.java
@@ -0,0 +1,25 @@
+package org.ntlab.amaryllis.server.entities;
+
+
+import org.w3c.dom.Text;
+import java.util.UUID;
+import static java.util.UUID.randomUUID;
+
+public class Comment {
+    String commentId;
+    String uid;
+    String text;
+
+    public Comment(String uid, String text) {
+        this.commentId = randomUUID().toString();
+        this.uid = uid;
+        this.text = text;
+    }
+
+    public String getCid(){ return commentId; }
+
+    public String getUid(){ return uid; }
+
+    public String getText(){ return text; }
+
+}
diff --git a/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java b/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
index b41b615..902f2a6 100644
--- a/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
+++ b/src/main/java/org/ntlab/amaryllis/server/entities/Voicememo.java
@@ -1,5 +1,7 @@
 package org.ntlab.amaryllis.server.entities;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import java.awt.datatransfer.FlavorListener;
 import java.util.ArrayList;
 import java.util.Calendar;
 
@@ -14,12 +16,11 @@
     private String title;
     private String summary;
     private Integer times;
+    @JsonIgnore
     private ArrayList<String> favolist;
-    private Integer favos;//favoslistの要素数
+    private Integer favos;
     private ArrayList<String> categories;
-    private ArrayList<Integer> comments_commentNo;
-    private ArrayList<String> comments_uid;
-    private ArrayList<String> comments_comment;
+    private ArrayList<Comment> comments;
 
     public Voicememo(String vid, String uid, Integer time, String data, double latitude, double longitude, String title, String summary) {
 
@@ -35,12 +36,9 @@
         setTitle(title);
         setSummary(summary);
         this.times = 0;
-//        this.favos = 0;
+        this.favos = 0;
 //        categories = new ArrayList<>();
-//        comments_commentNo = new ArrayList<>();
-//        comments_uid = new ArrayList<>();
-//        comments_comment = new ArrayList<>();
-
+//        comments = new ArrayList<>();
     }
 
 
@@ -58,7 +56,6 @@
         this.vid = vid;
     }
 
-
     private String getUid() {
         return uid;
     }
@@ -131,34 +128,78 @@
         times++;
     }
 
-//    public ArrayList<String> getFavolist(){ return favolist; }
-//
-//    public boolean checkFavo(String uid){
-//        for (String a : favolist) {
-//            if (a.equals(vid)) {
-//                return true;
-//            }
-//        }
-//        return false;
-//    }
-//
-//    private void addFavolist(String uid){
-//        favolist.add(uid);
-//        calcFavos();
-//    }
-//
-//    public Integer getFavos(){ return favos; }
-//    private void calcFavos(){
-//        favos = favolist.size();
-//    }
+    public ArrayList<String> getFavolist(){ return favolist; }
+
+    public boolean checkFavo(String uid){
+        for (String a : favolist) {
+            if (a.equals(vid)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void addFavolist(String uid){
+        if(checkFavo(uid)){
+            return;
+        }
+            favolist.add(uid);
+            setFavos();
+
+    }
+
+    public void removeFavolist(String uid) {
+        favolist.remove(uid);
+        setFavos();
+    }
+
+    public Integer getFavos(){ return favos; }
+
+    private void setFavos(){
+        favos = favolist.size();
+    }
+
 //
 //    public ArrayList<String> getCategory(){ return categories; }
 //
-//    public ArrayList<Integer> getComments_commentNo(){ return comments_commentNo; }
+//    public void addCategory(String categoryId){
+//        for (String a : categories) {
+//            if (a.equals(categoryId)) {
+//                return;
+//            }
+//        }
+//        categories.add(categoryId);
+//    }
 //
-//    public ArrayList<String> getComments_uid(){ return comments_uid; }
+//    public void removeCategory(String CategoryId) {
+//        categories.remove(CategoryId);
+//    }
 //
-//    public ArrayList<String> getComments_comment(){ return comments_comment; }
+//
+//    public ArrayList<Comment> getComments(){ return comments; }
+//
+//    public Comment getComment(String commentId) {
+//        for (Comment a : comments) {
+//            if (a.getCid().equals(commentId)) {
+//                return a;
+//            }
+//        }
+//        return null;
+//    }
+//
+//    public Comment createComment(String uid, String text) {
+//        if (uid == null || text == null) {
+//            return null;
+//        }
+//        Comment newComment = new Comment(uid, text);
+//        comments.add(newComment);
+//        return newComment;
+//    }
+//
+//    public void removeComment(String commentId) {
+//        Comment removeComment = getComment(commentId);
+//        comments.remove(removeComment);
+//    }
 
 
 }
diff --git a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
index edcaecb..d6a3283 100644
--- a/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
+++ b/src/main/java/org/ntlab/amaryllis/server/models/Voicememos.java
@@ -20,16 +20,12 @@
         return theInstance;
     }
 
-    public static String createVid() {
+    private static String createVid() {
         String vid = UUID.randomUUID().toString();
         return vid;
     }
 
     public Voicememo getVoicememo(String vid) {
-        if(vid.equals(null)){
-            return null;
-        }
-
         for (Voicememo a : voicememos) {
             if (a.getVid().equals(vid)) {
                 return a;
@@ -57,10 +53,6 @@
     }
 
     public void removeVoicememo(String vid) {
-        if(vid.equals(null)){
-            return;
-        }
-
         Voicememo removeVoicememo = getVoicememo(vid);
         voicememos.remove(removeVoicememo);
     }