Updated CLI

Command Line Interface has more functionality, minor core framework
changes