CPK Refactoring, some jobs already pass the tests, working on getting all to pass