Added step selection. Product WIP
Merge Resolution