Joe edited TradePage, added methods to Encounterer, changed fillCargo in Encounter to public