Move some more fns from job to tasks