Changed Event class

Event better represents what it is supposed to now, need to change
everywhere where we call it though