Started rewriting YamlManager, left a mess.