Refactored events to be more generic.  Of course, at this point, the events that needed to be added have already been added...  Bah.