Updated step 1-4 and wip for step 5