fixing the last bits of refactor work
channels are pretty