@stuartf is this one followed up on at all? It still looks for the `api` based on method. Before I do another round of review I just want to make sure everything is followed up on.