Armada - more refactoring.