More work in progress for embedding