parts 1 and 2 of the task almost done!