Adding in the job infrastructure