ack. added a TODO that this should really be moved to the control channel.