WIP: Lots and lots of undercloud stuff

Just me being an idiot. I actually fixed it, but just didn't push that yet.