I'd like to discuss what's going on here ... maybe this would all be better as a pull request onto a main command-line branch ...