Changed how singleton creation works to follow "builder pattern". It's cleaner this way, and more familiar for many.