wip: refactored cli to export commands