WIP: Flexible variant model for -03 draft