#3 
+ commenting out implementation errors after updating the data model