First build from YAML

* Also propogated bugfix from previous commit into YAML
* Also, also, added some more general silliness