Progress on SurveyEditor Facade