On-demand? We need a Router wrapper for location calls.