Ongoing work on build_survey