More work on battle system. . .