Initial grader
Improved grader and checks