More work on job saving and loading.