Unit conversions now work, probably has some bugs