Fixed all issues with step 1, doing some exploratory work for step 2.