More changes in line with comments plus we have started on job runner

I don't like submitting half-baked code for review, but I'd rather get a review for smaller pieces than unloading a big heap of stuff.