Final CLI fix-- back to the problem w/ hooks.