Initial implementation of buffer extending. Debug output reduced.