more work on CLI