Added more data, improved models, added views and templates first time