Refactor job submit

Incomplete change.