Updated TODO list and example in code