Refactor SurveyActivity to prepare for moving takeover into it