Spec tweak.
Included CLI input parser.