lots of restructuring; adding channels.