Working on managing the survey in heya