Started breaking out the cloud API stuff