Lunchtime commit
Started on second iteration of views