major rehaul of object structure and relationships