Cloud implementation attempt 1

Let's merge in the cloud-implemented version.