Now everything compiles properly. The singletons should be working now.