refactored ChannelSelect to use new Waffle objects