Mercenaries and trading

Merge

Almost same post