Combat view mid update

Got the combat view to appear, as well as made changes so that combat
will be able to work