Updated TODO, Roadmap