More work on validation.