Added initial grader and checks