This is just a quick and dirty hack to try and see if the router
actually behaves as it should. I renamed the old methods to XXX_* and
implemented new ones calling the router. This has to be cleaned up
later.