Finished part 1 of hwk