WIP for migrating to new channel API