Work on new cli user interface.