Polished

Kind sculpted to the point of not working :D

YamlToTrace is kind of elegant now though