Undid the singleton adventure, and updated TODO.