cleaned up, modified and added Joel's quiz model