Commit 2
Commit 4
Commit 5 - new view working