Channel refactor

We need to subscribe here, and it would be good to chain this with the return observable.