Progress on battle
More progress on battle