big 'ole commit, cleanup and use proxy models for submissions