Dev

Hi, Trent --

A lot more coverage, a few bugs, and a some cleanup. This is the last of the changes that are covered by the narrative of the book, but I'm going to continue working on it to try to cover the whole thing.

Let me know if you have any questions or issues with the changes. I've tried to give good commit messages.

Steve