Work on CLI status codes