Grader working, needs cleanup