Initial wiring of jobs and task refactor