Added initial checks and grader