Adding checks and grader