Merging E605A - Questionnaire Refactoring

Merge for @mlhall3 and @danrosshoward pull request #260