Made some progress on a few APIs.