WIP: Refactor cloud yet and again