Some cleanup.
Start Matching for Quiz3 to experiment.

Initial pass using quiz2 model. Begin experimenting with other models.