Updated model, started work on views