Work in progress adding views and models