WIP: World rewrite #2

Draft
Jayrude wants to merge 5 commits from world-rewrite into main

5 Commits