Added entity combat

Updated to lawrences commit