Add preliminary CLI