Revert "Revert "Karrot rework""

This reverts commit 77112dbfbac3ac0fc57a0e5e51f407cfd6be9eec.