Reworked battle class