Fix Chapter 2 and Make it all work