Adding Checks and (Updated) Grader