Almost finishes step 3
Updates