Yaml stuff

Don't merge this right now. Just testing if it works.