More progress, working on refactoring association proxies