Finally got some stuff working better. I hate BigDecimal...