More TODOs before I forget