Adding stuff to the TODO