WIP: Refactor buffer to accept fragments