starting to clean up unit conversion