Added embed back in but looked at _s to see what they do. I think that this will need further testing but it's in line with what Automattic has, so it must be the way to go.