Joe added methods to CargoHold
Merge origin/master