completed step 2 tests
committed work v2