Split out grading somewhat