working on battle stuff