Flesh out some new API functions
Resolving merge conflict
Adding in accidentally-removed code
Merge pull request #8453 from techhat/cloudapi

Flesh out some new API functions