abyss-wolf - Made some more progress on this one and I’m happy...