Started adding pint support
Now really works with PINT