Finish layout and routes (Ch 5, pre-exercises)