Task 07 and 17 complete - may want to update them later.