Snapshot
Intermediate commit
Finish layout and routes