Updating the events system to be a little leaner