More validation
All tests passing