First cut of value-sets in terminology. Still some work to go on conversion, representation and serialisation.