Catching up on commits, but mainly adding embed service