Switched event callback back to having the callback stored in the EVENT objects, rather than directly storing the method directly in the event hashtable