Added in many of the changes from the config system to yaml (the config system is everywhere!!!)