through section 5.3.2
changed tests to refactored format
Finish layout and routes