Begin work towards correct number/locale formatting