refactoring begins, object oriented data model