WIP: Karte #48

Closed
n0th1ng wants to merge 2 commits from karte into main