Loads of work to the cli package.