Replace the CLI

:construction: