Added stuff to the TODO list