Add beginnings of channel management code