add attempt at step 2

needs refactoring
add test for step 2