Tagging

Sorry I didn't notice this before, but we're iterating over a channel_list, but there's only one channel in this context, "channel". Could you fix this on the issue 6 branch?