Three Dollar Quill

All right. I ended up just jumping in and updating code until Mypy stopped complaining. This resulted in something happening with the tests, and I'll try and get them passing again later.

Basically, I just did what seemed to make sense, and nothing obviously broke yet. I should be able to delete a lot of code now, but I don't yet know for sure.

We traveled again today, and I feel like I was lucky to get this much done, and I don't have the energy to write this up in any more detail.

Good night.