WIP for Surface descriminated union.