Resolving api (7/14)

Resolving api