Basic CLI in place