Refactored FullSurvey2a - added first survey section

Still in need of comments.