cleaning up new combat system
expanding utility of views