Finished JobToSwap, minor fixes in CD