More validation

Validation!