Some running version with Output(Sink), needs cleanup...
Some cleanup, throwing out a lot of MRHelpers stuff