Added more stuff to TODO