Finished chapt 6.  prob 3 chap 7
Finished chap 7
merged