HUGE UPDATE! Got the CLI package mostly ironed out.