Revive frozen PR

[DutchmanNL]

#90 is not accepting review comments and copilot follow up, create a new PR with lessons learned from #90 and close the old one