de-clusterf*ck api code
...api?