stuff
partial commit
merged branch
Finish layout and routes