Laying the ground for spipe.
Merged in spipe_bin, not many changes.