wip on currency management
roll back on currency matching