ADDED: Validation is now working somewhat.