Replaced Javascript Numbers with an Amount class that currently wraps BigDecimal - Math should now work