Added basic grader and checks