Fixes #3 and Fixes #4

Fixing everything we need for the job class