Adding a better?? version of the thing which keeps track of the partial events and headers