uh
restructure to require no channel names