Initial association refactoring
More progress, working on refactoring association proxies