Adding several new features. Only added to the validation functions for now.