working on model and views