Jobs

Merging jobs branch back into master.