Made some progress on the data layer

Also defined some views for the users