I think grader 12 is working, although ugly. Will clean up error messages for final