Changes to Submit.

More modular changes.