put in some TODO pointers to #6715