A take on re-implementing channels (WIP- don't merge)

This is WIP and not yet finished.

+1 I did not remove it as I wasn't sure whether thats what you intend it to be.