Need to rethink a good part of the Router.