Now adding in channels!! :-)