I'm just going to pull all this into main and re-branch because I think there is enough here for us to use.

Besides, master is empty.