Added data model. Currently not working