Add example event handler
Allow adding/removing handlers at any point
Update TODO