Update TODO, a lot of that stuff is done