diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
index 42e1b04c71e5f42fa8dfe4b28c7737fdb37df1bc..62ae4c9632d6334b0f89f403b249d7a229ab0bb8 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java
@@ -1,26 +1,43 @@
 package thinkTogether.groupManagement.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.repository.Repository;
 import org.springframework.web.bind.annotation.*;
-import thinktogether.groupManagement.model.Group;
+import thinkTogether.groupManagement.model.Group;
 
 import java.util.List;
 
 
 @RestController
 // Verwendet das Repository und gibt die Daten zurück
-public class GroupManagementController {
+public class GroupManagementController implements iGroupService {
 
 
+    private thinkTogether.groupManagement.repo.iGroupRepository repository;
+
+    @RequestMapping("/")
+    public String index() {
+       return "Hello from the GroupManagement Controller!";
+    }
+
     @Autowired
-    private thinktogether.groupManagement.repo.iGroupRepository repository;
+    public GroupManagementController(Repository repository){
+        this.repository = (thinkTogether.groupManagement.repo.iGroupRepository) repository;
+    }
 
 
-    @GetMapping(value = "/groups")
+    @RequestMapping(value="/groups")
+    @Override
     public List<Group> findAll() {
         return repository.findAll();
     }
 
+    @RequestMapping(value = "/groups/{id}", method = RequestMethod.GET)
+    @Override
+    public Group findByID(@RequestParam(value = "id")int id) {
+        return repository.findByID(id);
+    }
+
     //@GetMapping("/groups/{id}")
     //public Group getGroupById(@PathVariable(value = "group_ID") long group_ID) {
     //    Group group = repository.findOne(group_ID);
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java
index 7d3fc0956bbea62f360691f85219596f0be940d8..d75f51096a26d5974d97d786ba7b62fcebb97669 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/controller/iGroupService.java
@@ -1,13 +1,14 @@
 package thinkTogether.groupManagement.controller;
 
 import org.springframework.stereotype.Service;
-import thinktogether.groupManagement.model.Group;
-import thinktogether.groupManagement.repo.iGroupRepository;
+import thinkTogether.groupManagement.model.Group;
+import thinkTogether.groupManagement.repo.iGroupRepository;
 
 import java.util.List;
 
-@Service
-public interface iGroupService extends iGroupRepository {
+public interface iGroupService {
 
-    List<Group> findAll();
+    public List<Group> findAll();
+
+    public Group findByID(int id);
 }
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java
index ffbbcfe6ac518abcd2f377d357feda968ce38014..20999ac0ddf2d7d0d05a5f3db3baf2e88ee421cc 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/model/Group.java
@@ -1,4 +1,4 @@
-package thinktogether.groupManagement.model;
+package thinkTogether.groupManagement.model;
 
 import javax.persistence.*;
 import java.util.List;
@@ -7,38 +7,34 @@ import java.util.List;
 @Table(name = "group")
 public class Group {
 
+    private static final int serialVersion = -1230;
     @Id
-    private int id;
+    @GeneratedValue
+    private int ID;
 
-    @Column(name="erstell_datum")
-    private String datum;
+    @Column(name="Status")
+    private boolean status;
 
-    @Column(name="member")
-    private int member_id;
+    @Column(name="ErstellDatum")
+    private String datum;
 
 
     @Column(name="modul_ID")
     private int modul_id;
 
-    @Column(name="status")
-    private boolean status;
+
 
     protected Group(){
     }
 
-    public Group(int id, String datum, int member_id, int modul_id, boolean status){
-        this.id=id;
+    public Group(boolean status, String datum, int modul_id ){
         this.datum=datum;
-        this.member_id=member_id;
         this.modul_id=modul_id;
         this.status=status;
 
     }
     public Integer getId() {
-        return id;
-    }
-    public void setId (Integer id) {
-        this.id = id;
+        return ID;
     }
     public String getDatum() {
         return datum;
@@ -46,8 +42,6 @@ public class Group {
     public void setDatum(String datum) {
         this.datum = datum;
     }
-    public Integer getMember() { return member_id; }
-    public void setMember(Integer id) {this.member_id = id; }
     public Integer getModul() { return modul_id; }
     public void setModul(Integer id) {this.modul_id = id; }
     public boolean getStatus() {
@@ -61,8 +55,10 @@ public class Group {
     @Override
     public String toString() {
         return "Group{" +
+                ", ID= '" + ID + '\'' +
                 ", Datum='" + datum + '\'' +
-                ", Status=" + status +
+                ", Status=" + status + '\'' +
+                ", ModulID=" + modul_id + '\'' +
                 '}';
     }
 }
diff --git a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java
index 1233a6df2a82663e41aaf45571c3fe77ede66c38..e9083ea75dc629efecd733cfaa73fe23d49f19ca 100644
--- a/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java
+++ b/groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java
@@ -1,15 +1,19 @@
-package thinktogether.groupManagement.repo;
+package thinkTogether.groupManagement.repo;
 
 
 import org.springframework.data.repository.Repository;
-import thinktogether.groupManagement.model.Group;
+import org.springframework.stereotype.Service;
+import thinkTogether.groupManagement.model.Group;
 
 import javax.persistence.Id;
 import java.util.List;
 
 //Erstellt Zwischenspeicher für die Datenentitäten? "DAO"???
+@Service
 public interface iGroupRepository extends Repository<Group, Integer> {
-    List<Group> findAll();
+    public List<Group> findAll();
+    public Group findByID(int iD);
+
 
 }
 
diff --git a/groupManagement/src/main/resources/application.properties b/groupManagement/src/main/resources/application.properties
index e91bde85fa98c92c2ed84a7bfb9197e42c60dfde..435cb55b2671fb97dffba0a0c55af517d80e3adf 100644
--- a/groupManagement/src/main/resources/application.properties
+++ b/groupManagement/src/main/resources/application.properties
@@ -11,7 +11,8 @@ spring.jpa.show-sql=true
 # Hibernate ddl auto (create, create-drop, update): with "update" the database
 # schema will be automatically updated accordingly to java entities found in
 # the project
-spring.jpa.hibernate.ddl-auto=update
+#spring.jpa.hibernate.ddl-auto=update
+spring.jpa.properties.hibernate.validator.apply_to_ddl=false
 # Allows Hibernate to generate SQL optimized for a particular DBMS
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDB103Dialect
 # naming strategy
@@ -20,6 +21,3 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.open-in-view=false
 spring.datasource.validationQuery=SELECT 1
-
-#server:
-#    port:8080
\ No newline at end of file
diff --git a/groupManagement/src/test/java/thinkTogether/groupManagement/repo/iGroupRepositoryTest.java b/groupManagement/src/test/java/thinkTogether/groupManagement/repo/iGroupRepositoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..dd4d316460fa84224b7052fed8eddb624fadb3fd
--- /dev/null
+++ b/groupManagement/src/test/java/thinkTogether/groupManagement/repo/iGroupRepositoryTest.java
@@ -0,0 +1,7 @@
+package thinkTogether.groupManagement.repo;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class iGroupRepositoryTest {
+    //TODO
+}
\ No newline at end of file