Combat command refactor preparation