Added battle and move to model
Added battle and move to model