Validator work
More validator work