TODO: 1.8 Modified buffer size approach

Thoughts around buffer sizes and what might be possible to do...