Adding the Singleton pattern. Don't forget to ad a parallel test (threads).