More work on new battle system