Added first checks and grader