Revert the current implementation again. There really is no good place in the current architecture to put this. This one however would depend on feature we don't have yet to work correctly, so I'm moving it again...
Revert "Revert the current implementation again. There really is no good place in the current architecture to put this. This one however would depend on feature we don't have yet to work correctly, so I'm moving it again..."

This reverts commit 0d525f0b41a32efaa544c78ee157f73be2c10551.
Formatting