BuffMonitor (will add metadata later)
Merge branch 'buffmonitor'