#68 WIP
#68 implement SharedSteps to reduce repetition