survey creation refactor done. Next step is redo the survey display.