but what about Close Combat?

clearly we need namespacing