Added stuff to TODO