Added grader + checks