Cloudtm v3

Pedro, again: I don't know why when I issue the pull request, it thinks I have (re)-done some of the changes I already did. Let me know if this is pullable
Diego