             throw EpubServerError.epubFetcher(underlyingError: error)
         }
 
-        // TODO: Change the handlers so that they avec generic (instead of X 
-        //       handlers pet Epub.
         /// Webserver HTTP GET ressources request handler
         func ressourcesHandler(request: GCDWebServerRequest?) -> GCDWebServerResponse? {
             let response: GCDWebServerResponse

                        atEndpoint endpoint: String) throws {
        let fetcher: EpubFetcher

        guard containers[endpoint] == nil else {
            log(level: .warning, "\(endpoint) is already in use.")
            return
        }
        addSelfLinkTo(publication: publication, endpoint: endpoint)
        // FIXME: Are these dictionaries really necessary?
        containers[endpoint] = container
        publications[endpoint] = publication
        // Initialize the Fetcher
        do {
            fetcher = try EpubFetcher(publication: publication, container: container)

    }

    /// The base URL of the server
    public var baseUrl: URL? {
        get { return webServer.serverURL }
    }

