first round of changes to support new/edit jobs