refactoring the jobs wip