Fixed the Battling a little, still not finished.