Finished with part1 of 2 for hw