Added another first pass, this one at events