Chapter 6 done. Feeling I should add some kind of automated tests :-/