Initial refactor of channels.