Work on making CurrencyDisplay more efficient