Updated TODO based on Whitney's comments