This was about 20 commits worth of work. Significant architectural changes required.
I'm glad this project is at the stage where I can just make those architectural changes without bothering anyone (except me).
Comby (https://comby.dev/) was really helpful!