             throw error
         }
         
-        // TODO: can we do this better? [RH] (3/28/16)
-        // like maybe notifications? delegate? account update block?
         self.client.authenticate(account: account)
     }
     

    
    func codeGrantAuthorizationURL() -> NSURL
    {
        let parameters = ["response_type": "code",
                          "client_id": self.configuration.clientKey,
                          "redirect_uri": self.codeGrantRedirectURI,
                          "scope": Scope.combine(self.configuration.scopes),
                          "state": self.dynamicType.state]
        
        var error: NSError?
        guard let urlString = VimeoBaseURLString?.URLByAppendingPathComponent("oauth/authorize").absoluteString
        else
        {
            fatalError("Could not make code grant auth URL")

    {
        guard let queryString = responseURL.query,
            let parameters = self.parametersFromQueryString(queryString),
            let code = parameters[self.dynamicType.CodeKey],
            let state = parameters[self.dynamicType.StateKey]
        else
        {
            let errorDescription = "Could not retrieve parameters from code grant response"
