TODOs

So I don't forget.