Adding checks and grader.