Tracking between objects (UNTESTED)
Fixes (didn't try to compile previously)
Better tracking, but it's still off..
On Buffer fullness: refresh, flatten stream