Update with lots of refactoring and starting intermediate book.