added views, everything working at the moment