Some fiddling to deal with the different scopes involved for classes.
First time use-case 'simple' is working.