End of Day commits

Getting closer - data model problems