Add Job class and update existing code to utilize