Update to Questionaire objects. Foundation nearly complete