Last commit before branching to battle_backend