added basic combat