67391744 popquiz rollover

@hkal Adding the pull request, but I'm getting feedback before we merge it.

https://www.pivotaltracker.com/story/show/67391744