Fixes move to class method.
Makes it so you can have both free form and list of options for questions.