WIP enterprise validation stuff