A little more work on the quiz