Untested, but survey construction should now refactor to add questions after a REPEATER type question. Committing before I get involved with GUIDrawer