added to Data and Model class, next is plotting