Singleton Config FTW
Bump
So much cleanup