progress on battle system