WIP #34

CLI support