i know i should have brought up this earlier  but i wonder if we would benefit from moving these into it is own section  we could do it in a clean up patch  but because it is a time sensitive issue  we d need to get it in before havana releases i wonder if it is worth doing it in another patchset in this review