Moving some functions off to elements
Modifying views to reflect new queries
Adding option to initiate battle
Redefining model relationships