Refactor battle component props into hash
Battles work!