Added more stuff to the TODO list