Actually finish chapter 5 layout and routes