Working on battle mechanics