Adding initial checks and grader