Does now use the new Quiz class