Battle heavily extended

Battle extended to the point that is now only lacking turn checks