Simplify and just get it to output yaml!