First basic work for the CurrencyType class. Many cleanups.