Refactor creation of questions and choices to survey and question classes.  Refactor new survey form in process.  Currently working.