Combat Expansion and Refactoring