you'll need to make sure :step_mode ends up in here after you merge