Cloudtm v3

I'll squash after the revision =)