wip commit
WIP for conditional validation