diff --git a/app/src/main/java/com/example/cosmosclient/entities/Group.java b/app/src/main/java/com/example/cosmosclient/entities/Group.java
index 9e728a3..701930a 100644
--- a/app/src/main/java/com/example/cosmosclient/entities/Group.java
+++ b/app/src/main/java/com/example/cosmosclient/entities/Group.java
@@ -1,16 +1,19 @@
 package com.example.cosmosclient.entities;
 
+import com.example.cosmosclient.jsons.RidUriJson;
+import com.example.cosmosclient.jsons.UidUriJson;
+
 import java.util.ArrayList;
-import java.util.Set;
 
 public class Group {
     private String gId;
     private String uri, name;
-    /*   Userどうするか
-    private ArrayList<User> members;
-    */
-    //private ArrayList<Request> requests;
-    private Set<Request> requests;
+    // Userどうする
+    private ArrayList<UidUriJson> members = new ArrayList<>();
+
+    private ArrayList<RidUriJson> requests = new ArrayList<>();
+//  private Set<User> members = new HashSet<>();
+//    private Set<Request> requests;
 
     public Group(){
 
@@ -54,37 +57,65 @@
         return name;
     }
 
-    public Set<Request> getRequests(){
-        return requests;
-    }
+//    public Set<Request> getRequests(){
+//        return requests;
+//    }
+//
+//    public void setRequests(Set<Request> requests){
+//        this.requests = requests;
+//    }
 
-    public void setRequests(Set<Request> requests){
-        this.requests = requests;
-    }
-
-    public void addRequests(Request request){
+    public void addRequests(RidUriJson request){
         requests.add(request);
     }
 
-    public ArrayList<Request> getRequestsList(){
-        ArrayList<Request> list = new ArrayList<Request>(getRequests());
+//    public ArrayList<Request> getRequestsList(){
+//        ArrayList<Request> list = new ArrayList<Request>(getRequests());
+//        return list;
+//    }
+
+        public ArrayList<RidUriJson> getRequestsList(){
+        ArrayList<RidUriJson> list = new ArrayList<RidUriJson>(getRequests());
         return list;
     }
 
+//    public void setMembers(Set<User> members){
+//        this.members= members;
+//    }
+//
+//    public Set<User> getMembers(){
+//        return members;
+//    }
+
+        public void setMembers(ArrayList<UidUriJson> members){
+        this.members= members;
+    }
+
+    public ArrayList<UidUriJson> getMembers(){
+        return members;
+    }
+        public ArrayList<RidUriJson> getRequests(){
+        return requests;
+    }
+
+    public void setRequests(ArrayList<RidUriJson> requests){
+        this.requests = requests;
+    }
+
     /*メンバー*/
-    //public ArrayList<User> getMembersList(){
-    //    return null;
-    //}
-
-    //public void addMemberByUid(String uId){
-    //
-    //    members.add(user);
-    //}
-
-    //public DeleteResult deleteMember(String uid){
-    //    members.remove(members.indexOf(uid));
-    //    return null;
-    //}
+//    public ArrayList<User> getMembersList(){
+//        return null;
+//    }
+//
+//    public void addMemberByUid(String uId){
+//
+//        members.add(user);
+//    }
+//
+//    public DeleteResult deleteMember(String uid){
+//        members.remove(members.indexOf(uid));
+//        return null;
+//    }
 
     /*リクエスト*/