somewhat related to #3

Should be backwards compatible, but as you say in #3, we'll need a lot more tests to be sure. happy to discuss any of the changes or make adjustments.
Looks fine. I'm not really sure what's as I don't really have a use-case for the CLI.