Think the API is looking good now.