WIP: Lots and lots of undercloud stuff

Surely not.