Finish implementing events and adjust TODO status