still working on battle