Really merged changes in with validation.

Took a little extra effort…