Nit: please say TODO(amwatson). Please capitalize the first letter of a sentence. Please put a period after a sentence.