WIP: Lots and lots of undercloud stuff

Nope, this change just predates its existence.