Start work on refactoring job stuff. Use generators.