diff --git a/src/com/generation/Main.java b/src/com/generation/Main.java
index 9e24556..ba534b5 100644
--- a/src/com/generation/Main.java
+++ b/src/com/generation/Main.java
@@ -5,6 +5,8 @@
 import com.generation.service.CourseService;
 import com.generation.service.StudentService;
 import com.generation.utils.PrinterHelper;
+import com.generation.service.StudentService;
+
 
 import java.text.ParseException;
 import java.util.Scanner;
diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java
index 0897ebe..d3bc066 100644
--- a/src/com/generation/model/Student.java
+++ b/src/com/generation/model/Student.java
@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
+//import java.text.Annotation;
+
 public class Student
     extends Person
     implements Evaluation
@@ -24,6 +26,13 @@ public Student( String id, String name, String email, Date birthDate )
     public void enrollToCourse( Course course )
     {
         //TODO implement this method
+        if(!isAttendingCourse(course.getCode())) {
+            courses.add(course);
+        }
+        else{
+            System.out.println("Student already enrolled in course.");
+        }
+
     }
 
     public void registerApprovedCourse( Course course )
@@ -34,7 +43,14 @@ public void registerApprovedCourse( Course course )
 
     public boolean isAttendingCourse( String courseCode )
     {
+
+
         //TODO implement this method
+        for(Course c: courses){
+            if(c.getCode().equals(courseCode)) {
+                return true;
+            }
+        }
         return false;
     }
 
diff --git a/src/com/generation/service/StudentService.java b/src/com/generation/service/StudentService.java
index f980e40..eeaa67f 100644
--- a/src/com/generation/service/StudentService.java
+++ b/src/com/generation/service/StudentService.java
@@ -26,6 +26,11 @@ public Student findStudent( String studentId )
 
     public void showSummary()
     {
+        System.out.println("Students: ");
+        for(Student s: students.values()) {
+//            Student stud = students.get(key);
+            System.out.println(s.toString());
+        }
         //TODO implement
     }