*8787* Add new submission; clean up submission data with vars