working on hw3
merged