One week later. I think I now have the initial rework in a usable place which also allowed me to make some QoL changes that weren't possible before which will be nice. That said, now to redo another thing, but hopefully that one should be painless and then the real fun begins.
