WIP in cloudcontrol