Work in progress towards CFCli 2.0