Feature/money refactor

Refactores some money features, solves partly #7 issue mentioned by @camspiers