Modified fight logic... now working