Grade solution form updated for new format (not done)