Starting to work on YAML integration