Added step selection. Product WIP