Working on battle system