Finished adding survey, closes #88