More todo before I forget.