         createDefaultRouter()
     }
 
-    public convenience init(traceUrl: URL, passThroughBaseUrl: URL? = nil) {
+    public convenience init(traceUrl: URL, baseUrl: URL? = nil) {
         self.init()
         
-        self.passThroughBaseUrl = passThroughBaseUrl
+        self.baseUrl = baseUrl
         addTrace(url: traceUrl)
     }
     
-    public convenience init(recordUrl: URL, passThroughBaseUrl: URL) {
+    public convenience init(recordUrl: URL, baseUrl: URL) {
         self.init()
         
         defer {
             /* Defer so that the didSet runs on recordUrl */
             self.recordUrl = recordUrl
-            self.passThroughBaseUrl = passThroughBaseUrl
+            self.baseUrl = baseUrl
         }
     }
     

    
    public var port: Int?
    public var version = 0
    public var passThroughBaseUrl: URL?
    public var recordUrl: URL? {
        didSet {
            if let recordUrl = recordUrl {

                
                res.data = trace.responseBody
                resultBlock(.response(res))
            } else if let baseUrl = self.baseUrl {
                let url = URL(string: ".\(req.file)", relativeTo: baseUrl)!
                
                print("Pass-through URL: \(url.absoluteURL)")
                var urlRequest = URLRequest(url: url)
