Added partial support for channels (see new priority todo list item)