Refactoring still... working toward simplified job runner interface