add event handler and RFC todo items