Add the full validation, needs to be tesed/