cli.py should be a thin layer just to handle the commands so the legic that is currently in the run_plan method should be moved into the equivalent function it calls in client.py. This will also mean all the code is in the module where the tracing starts.