Move most (if not all?) calls that CAN be moved to the designer, to the designer