progress on hw7
more progress on hw7