mbuffer-20140126 (WIP)