Added more quizzing functionality