Designer refactoring, work in progress