Updated TODO, reprioritised items