Work in progress - Started to work on the view