Making more progress on battle system