First pass at buffer queueing
Merge branch 'incoming' into incoming2