Add type to question, make class of choices