still working the battle system