CLI is now far along as well as the class hierarchy for the tool.