updated grader - still has bugs