GM arranged battles, closes #423