change TODO's to notes about why it's OK to iterate