- we need to stream events properly
- we need to clean up the client