Added initial grader, checks