Much work on Quiz

though much remains