Use flags bit to track allocations
Merge branch 'accurate_tracking'