More ch03 stuff
Add Ch 04 (optionals) stuff.