Working on the datamodel and admin