Complete through 5.3.2
Finish layout and routes