More work on conduits.

I prefer smaller commits, that way I can easily revert commits.