Buffer Management

Tbd