Begun rewriting for the new event system