Add history stuff to TODO