revert some of my changes, will be obsolete anyway with the upcoming Product class