fixing up mediator and routes to be more AMDy