Once more unto the breach dear friends
Adding basic eventing changes