Changed all EventHandlers to generic EventHandler<T>s