Updated TODO, ready to merge into master