Ads in article body

this looks a bit like I haven't actually done anything due to pulling in the upstream changes, but there is stuff there, I promise!