Reorder stuff for grade_soln