Continued work on battle system