Added quizcontroller and changed some methods