buncha new stuff, with the battle class created