Updated TODO with more stuff to do