Starting to add CLI validation/handling.  Perhaps a little OTT at this point