Awesome!  Does this now work?  If yes, we want to have in a separate PR!