Daniel's #6&7 pass autograder