[v0.0.3] - Trying to keep track of the stream... not working correctly yet :(