checkin some slow and messy progress in editing surveys
get survey editing working