Actually add unit conversion routine