diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..d1830ca 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/JavaFinalProject" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/JavaFinalProject b/JavaFinalProject
new file mode 160000
index 0000000..a70b9bf
--- /dev/null
+++ b/JavaFinalProject
@@ -0,0 +1 @@
+Subproject commit a70b9bf9f7067aec2dfe597ef1361ab89fb8cb27
diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java
index 0897ebe..61b299e 100644
--- a/src/com/generation/model/Student.java
+++ b/src/com/generation/model/Student.java
@@ -24,6 +24,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");
+        }
     }
 
     public void registerApprovedCourse( Course course )
@@ -35,6 +42,11 @@ 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..0a7ee14 100644
--- a/src/com/generation/service/StudentService.java
+++ b/src/com/generation/service/StudentService.java
@@ -3,6 +3,7 @@
 import com.generation.model.Course;
 import com.generation.model.Student;
 
+import java.security.Key;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -27,6 +28,11 @@ public Student findStudent( String studentId )
     public void showSummary()
     {
         //TODO implement
+        System.out.println("Students: ");
+        for (String key: students.keySet()){
+            Student student = students.get(key);
+            System.out.println(student);
+        }
     }
 
     public void enrollToCourse( String studentId, Course course )
diff --git a/src/com/generation/utils/PrinterHelper.java b/src/com/generation/utils/PrinterHelper.java
index 6f1ca9b..8f032ad 100644
--- a/src/com/generation/utils/PrinterHelper.java
+++ b/src/com/generation/utils/PrinterHelper.java
@@ -39,11 +39,23 @@ public static Student createStudentMenu( Scanner scanner )
         String email = scanner.next();
         System.out.println( "| Enter student birth date(mm/dd/yyyy)|" );
         DateFormat formatter = new SimpleDateFormat( "mm/dd/yyyy");
+        Date birthDate = null;
+        boolean validDate = false;
+
         //TODO validate date format and catch exception to avoid crash
-        Date birthDate = formatter.parse( scanner.next());
-        System.out.println( "|-------------------------------------|" );
-        Student student = new Student( id, name, email, birthDate );
-        System.out.println( "Student Successfully Registered! " );
+
+        while (!validDate){
+            //System.out.println("| Enter student birth date(mm/dd/yyyy)!");
+            try{
+                birthDate = formatter.parse(scanner.next());
+                validDate = true;
+            } catch (ParseException e){
+                System.out.println("Invalid date!");
+            }
+        } ;
+        System.out.println("------------------!");
+        Student student = new Student(id, name, email, birthDate);
+        System.out.println("Student Successfully Registered!");
         System.out.println(student);
         return student;
     }