Trying to make singletons a little sane. Not sure if right way to go