this should actually now work as expected
a lot of tweaks here and there still stuck in the woods