Added some events and started on the plugin spec