Get some more of the page router stuff to work