Updated
Updated
Updated spec
Finished layout and route