Bring Embedding back, simplify example 19 to not use it

This reverts a57bde0f05ae29a5a05e275a5b5fd3552a6bd173