Work on bug #5989.  It now does data and control channels.