Added routes.
Added additional test cases.
Finished layout and routes