Updated battle models.
Updated battle models.
Merge.