WIP Add currency conversion support

Same functions, with currency conversion support