Validation function created
Updating because of possible merge conflicts?
Trying to resolve merge conflicts