progress implementing datamodel