diff --git a/src/main/java/com/example/cosmos_serversb/entities/Group.java b/src/main/java/com/example/cosmos_serversb/entities/Group.java
index 086549a..7b2c965 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/Group.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java
@@ -1,4 +1,69 @@
 package com.example.cosmos_serversb.entities;
 
+import com.sun.imageio.plugins.common.SingleTileRenderedImage;
+
+import java.util.ArrayList;
+import com.example.cosmos_serversb.entities.*;
+
 public class Group {
+    private String gId, uri, name;
+    //private ArrayList<User> members;
+    //private ArrayList<Request> requests;
+
+
+    private Group(){
+
+    }
+
+    public Group(String gId, String uri, String name, String uId){
+        setGid(gId);
+        setUri(uri);
+        setName(name);
+        //addMember(uId);
+    }
+
+    public void setGid(String gId){
+        this.gId = gId;
+    }
+
+    public String getGid(){
+        return gId;
+    }
+
+    public void setUri(String uri){
+        this.uri = uri;
+    }
+
+    public String getUri(){
+        return uri;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public String getName(){
+        return name;
+    }
+
+    //public void addMember(String uid){
+    //    members.add(uid);
+    //}
+
+    //delete member
+
+    //public void addRequest(Request request){
+    //   requests.add(request);
+    //}
+
+    //delete request
+
+
+
+
+
+
+
+
 }
+
diff --git a/src/main/java/com/example/cosmos_serversb/entities/request.java b/src/main/java/com/example/cosmos_serversb/entities/request.java
new file mode 100644
index 0000000..f1d9b62
--- /dev/null
+++ b/src/main/java/com/example/cosmos_serversb/entities/request.java
@@ -0,0 +1,4 @@
+package com.example.cosmos_serversb.entities;
+
+public class request {
+}
diff --git a/src/main/java/com/example/cosmos_serversb/models/Groups.java b/src/main/java/com/example/cosmos_serversb/models/Groups.java
index 9d158a1..df3fd09 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Groups.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java
@@ -1,20 +1,20 @@
 package com.example.cosmos_serversb.models;
 
 
+import java.lang.reflect.Array;
 import java.util.*;
 import javax.inject.Singleton;
 import com.example.cosmos_serversb.entities.*;
 
-enum Respons{
+enum Respo{
     aaa
 }
 
 
 @Singleton
 public class Groups {
-    private  static  Groups thaInstance = null;
-    private ArrayList<Groups> accounts = new ArrayList<>();
-
+    private static Groups thaInstance = null;
+    private ArrayList<Group> accounts = new ArrayList<>();
 
     private Groups(){
 
@@ -27,7 +27,8 @@
         return thaInstance;
     }
 
-    public ArrayList<Groups> groupsList(String uId, String token){
+
+    public HashMap<String, String> groupsListByUid(String uId, String token){
         return null;
     }
 
@@ -35,11 +36,11 @@
         return null;
     }
 
-    public Group getGrupeByGroupId(String gId, String token){
+    public Group getGroupByGId(String gId, String token){
         return null;
     }
 
-    public Respons deleteGroup(String gId, String token){
+    public Respo deleteGroup(String gId, String token){
         return null;
     }