Joe (finally) added CargoHold and Ship
Merge origin/master