Testing some changes
Better ack handling
Merge branch 'stewart_temp' into stewart. Feature branch implementing ack with gaps.