Added unit conversion stuff. Didn't test.