Restructure a bit and add YQL support for experimentation