Initial draft of survey questions
Merge branch 'survey'