Finished programming for hw1