I happened to be refactoring the CLI without noticing this... can you rebase or simply submit a new one please? Thanks.