Trying to get validation working properly on edit