Added ChannelService
Resolved conflicts in ChannelService
Tweaked ChannelService