Work in Progress

Correct. We need to rely on the `end` event