flipped around some dispatcher/router stuff