Cleaned up the yaml_reader code and added a TODO
Merge remote-tracking branch 'origin/experimental' into experimental