Updated unit selector and CLI command to allow two-way unit conversion.