updating use of data model class

work in progress.