Started conversion to use CommandPattern.Match