Initial suggestion for extension implmentation.

CLI event now