Order couple of function more logicly, marking them static & add comment
Add stream-context support for listening to batch shipments
WS as per cs review