Progress! I had to shelve this for a few days to take care of some other stuff, but here are some pr