moving around some stuff for routing