WIP: Lots and lots of undercloud stuff

surely these aren't supposed to be in secrets?