Updated GRADER one last time. Readability, additional classes.