Add in activate battle and remove battle phase to the model