Combat View work

Start on combat view.