merged router with controller
cleaned up proxying