Added some combat stuff