working on model and html
working on views and html