updated data model. working to paste to cursor