Commit prior to implementing experimental Singleton design.