Updated TODO, reprioritised