Conditional Validation using with_options to improve readability

Hmm. Pretty sure we could use this

Notes