Start integrating flags with event handler

Start integrating flags with event handler #111