Message bufferizer - WIP