WIP
Add event listener and new tag policy