Finished 1 and 2 of the hw