moving things around as the router is weird