Working on step 7 and 8...