Flesh out more of the grading/form logic