simplified data model again.. cleaned up a lot of unused code