Finish layout and routes
Complete 5.6 exercise