For sure a requirement before this goes in