CLI usage

Work in progress