Update to CombatViewModel

- Prep work for the next stage of the CombatViewModel development