Retooling the embed functionality to allow component embedding