Start of large job refactoring
Further work on job refactoring
Job refactoring done