Chapter 1 rewrite
Rework Ch1