[wip] Feature/battle