Oh lord the progress. At the end of the day we had a huge merge in which we found out about a mistake we made. We had accidentally used the wrong file type in construct, making merges hard. We got that sorted out, and I ran through each individual file fixing errors. Lo, all of our code is now merged and it is glorious. github