Forgot to commit the code of the cli itself...