*chapter 1 80% done
*parts of chap 2
+ db cleanup

Signed-off-by: Max Hayman <maxhayman@maxhayman.co.uk>