BufferSegments still untested. Split files.