Added CLI Functionality detailed in the design

Showed the CLI some love friday.