Adding event tags

WIP currently.