Thing are still pretty much broken.

ExchangeRateLookup - Consider not to have it as Singleton. We already have 2 Singletons in our code (JStock & Factories). Too much Singletons, will increase the complexity of our code.