working on grading - incomplete