added simple combat and timing