hw2
trying to merge
hw7 fixes