Kind of odd behavior I think because it couples the code but yeah we can do both things on the validation if that's what you want. Will push that tomorrow