Refactoring, bug fixing, finishing off the implementation of mercenaries.