On-going work on multi currency