Refactored BattleSpecification all the way through