implemented joda money, refactored some code