Mostly done
Step 7 started