MPipe v2 first pass

Complete, but untested