Factor confirming into another step
Add "next" controller