Changed the cargoList to a map instead of an array.
Merge remote-tracking branch 'origin/master' into james/dev