Squash.  Add Validation