initial work on Number unit support