Optimizing the buffered version. Much work remains.