now supporting whole numbers and currencies