lib-ify the CLIs
REALLY lib-ify the CLI