Lots of work on CLI docs