Refactoring our channels away from the index