Yet another TODO update