Added more stuff to todo