Add Ch 7 & 8.
Merging from master