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 524fa87..dfff30a 100644
--- a/src/main/java/com/example/cosmos_serversb/entities/Group.java
+++ b/src/main/java/com/example/cosmos_serversb/entities/Group.java
@@ -6,42 +6,33 @@
 import static com.example.cosmos_serversb.models.Users.*;
 
 public class Group {
-    private Long id;
-    private String gId, uri, name;
+    private Long gId;
+    private String uri, name;
     private ArrayList<User> members;
     private ArrayList<Request> requests;
 
-    private Group(){
+    public Group(){
 
     }
 
     public Group(String gId, String uri, String name, String uId){
-        this.gId = gId;
-        //setGid(gId);
-        setUri(uri);
-        setName(name);
-        this.members.add(getUserById(uId));
-        this.requests = null;
+        this.gId = Long.parseLong(gId);
+        this.uri = uri;
+        this.name = name;
     }
 
-    //hibernate用
-    public Long getId() {
-        return id;
-    }
-
-    private void setId(Long id) {
-        this.id = id;
-    }
-
-
-    private void setGid(String gId){
-        this.gId = gId;
-    }
-
-    public String getGid(){
+    public Long getgId() {
         return gId;
     }
 
+    private void setgId(Long gId) {
+        this.gId = gId;
+    }
+
+    public String getUri() {
+        return uri;
+    }
+
     private void setUri(String uri){
         this.uri = uri;
     }
@@ -54,6 +45,10 @@
         this.name = name;
     }
 
+    public String getName(){
+        return name;
+    }
+
     public String getNameByGid(String gId){
         return name;
     }
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 9986a26..4912efd 100644
--- a/src/main/java/com/example/cosmos_serversb/models/Groups.java
+++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java
@@ -2,13 +2,13 @@
 
 import java.util.*;
 import javax.inject.Singleton;
-import javax.persistence.Column;
+
 import com.example.cosmos_serversb.entities.*;
 
 
 @Singleton
 public class Groups {
-    private static Groups thaInstance = null;
+    private static Groups theInstance = null;
     private static ArrayList<Group> groups = new ArrayList<>();
 
     private Groups(){
@@ -16,10 +16,10 @@
     }
 
     public static Groups getInstance(){
-        if(thaInstance == null){
-            thaInstance = new Groups();
+        if(theInstance == null){
+            theInstance = new Groups();
         }
-        return thaInstance;
+        return theInstance;
     }
 
     public static HashMap<String, String> getGroupsListByUid(String uId){
@@ -37,7 +37,7 @@
         Group editGroup;
         for (int i = 0; i < groups.size(); i++) {
             editGroup = groups.get(i);
-            if (editGroup.getGid().equals(gId)) {
+            if (editGroup.getgId().equals(gId)) {
                 return editGroup;
             }
         }
diff --git a/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java b/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java
index 76a87a1..c24bb51 100644
--- a/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java
+++ b/src/test/java/hibernateTest/models/NativeApiIllustrationTest.java
@@ -27,6 +27,7 @@
 import java.util.List;
 
 import hibernateTest.entities.Event;
+import hibernateTest.entities.Group;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.MetadataSources;
@@ -72,17 +73,23 @@
 		// create a couple of events...
 		Session session = sessionFactory.openSession();
 		session.beginTransaction();
-		session.save( new Event( "Our very first event!", new Date() ) );
-		session.save( new Event( "A follow up event", new Date() ) );
+		session.save( new Group("111", "http://test1", "Taro", "011" ) );
+		session.save( new Group("222", "http://test2", "Hanako", "022" ) );
+		//session.save( new Event( "Our very first event!", new Date() ) );
+		//session.save( new Event( "A follow up event", new Date() ) );
 		session.getTransaction().commit();
 		session.close();
 
 		// now lets pull events from the database and list them
+//		List result = session.createQuery( "from Event" ).list();
+//		for ( Event event : (List<Event>) result ) {
+//			System.out.println( "Event (" + event.getDate() + ") : " + event.getTitle() );
+//		}
 		session = sessionFactory.openSession();
 		session.beginTransaction();
-		List result = session.createQuery( "from Event" ).list();
-		for ( Event event : (List<Event>) result ) {
-			System.out.println( "Event (" + event.getDate() + ") : " + event.getTitle() );
+		List result = session.createQuery( "from Group" ).list();
+		for ( Group group : (List<Group>) result ) {
+			System.out.println( "Group (" + group.getgId() + ") : " + group.getUri() + ": " + group.getName());
 		}
 		session.getTransaction().commit();
 		session.close();
diff --git a/src/test/resources/hibernate.cfg.xml b/src/test/resources/hibernate.cfg.xml
index 68e7f3f..fa1080d 100644
--- a/src/test/resources/hibernate.cfg.xml
+++ b/src/test/resources/hibernate.cfg.xml
@@ -34,6 +34,7 @@
         <!-- Drop and re-create the database schema on startup -->
         <property name="hbm2ddl.auto">create</property>
 
+        <mapping resource="Group.hbm.xml"/>
         <mapping resource="Event.hbm.xml"/>
 
     </session-factory>