Step 1c

Added step 1c and test
Step 2

Through step 2 and tests