Made some changes to the singleton, still broken