Commiting the rest of the Job Manager changes. These were inteded to be part of the previous commit.