Work on moving to having router on its own process