Update TODO
Added more plumbing for dealing with collisions.