WIP - not selfcontained:

Bugfix