WIP on refactoring the context-based combat PR