Slow progress with chapter3 and moved some stuff from chapter 1 as that's still too long.
Solved merge conflict.