Update TODO, and add currently done