Added quiz type options, changes to how we loop through data.