This approach was the wrong way  :-)  Nothing like commit driven discussion :-)

This reverts commit 20854f0bf9f60215df876405bcc81e6d870cc832.