Submission db work

I wanna run the changes by you before I merge into master.