WIP - adding custom channel names