Chapter 2 completed

It should be done now. I'll have a look on other stuff in a moment