CLI enhancements

PR in progress, I am running into some issues for the moment.