diff --git a/src/com/generation/Main.java b/src/com/generation/Main.java
index 9e24556..46fd1a8 100644
--- a/src/com/generation/Main.java
+++ b/src/com/generation/Main.java
@@ -104,4 +104,6 @@ private static void registerStudent( StudentService studentService, Scanner scan
         Student student = PrinterHelper.createStudentMenu( scanner );
         studentService.subscribeStudent( student );
     }
+
+
 }
diff --git a/src/com/generation/model/Student.java b/src/com/generation/model/Student.java
index 0897ebe..3b312e2 100644
--- a/src/com/generation/model/Student.java
+++ b/src/com/generation/model/Student.java
@@ -21,9 +21,10 @@ public Student( String id, String name, String email, Date birthDate )
         super( id, name, email, birthDate );
     }
 
-    public void enrollToCourse( Course course )
+    public void enrollToCourse(Course course)
     {
         //TODO implement this method
+       courses.add(course);
     }
 
     public void registerApprovedCourse( Course course )
@@ -34,7 +35,11 @@ public void registerApprovedCourse( Course course )
 
     public boolean isAttendingCourse( String courseCode )
     {
-        //TODO implement this method
+        for (Course course: courses) {
+            if (course.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..375b658 100644
--- a/src/com/generation/service/StudentService.java
+++ b/src/com/generation/service/StudentService.java
@@ -27,6 +27,13 @@ public Student findStudent( String studentId )
     public void showSummary()
     {
         //TODO implement
+        System.out.println("Students: ");
+        for (Student student: students.values()
+             ) {
+            System.out.println(student.toString());
+
+
+        }
     }
 
     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..f0b554a 100644
--- a/src/com/generation/utils/PrinterHelper.java
+++ b/src/com/generation/utils/PrinterHelper.java
@@ -37,10 +37,24 @@ public static Student createStudentMenu( Scanner scanner )
         String id = scanner.next();
         System.out.println( "| Enter student email:                |" );
         String email = scanner.next();
-        System.out.println( "| Enter student birth date(mm/dd/yyyy)|" );
-        DateFormat formatter = new SimpleDateFormat( "mm/dd/yyyy");
+
+        DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy");
+
+
+        //This is all Adam's code
+        boolean validDate = false;
+        Date birthDate = null;
+        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!");
+                }
+        };
         //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! " );