Feature/embeds