Updated CLI (to match API changes)

* Refactoring and changes in opt handling
* Stubs for new features (WIP)