Up to date during hiatus

Other programming has come up that is a higher priority at work, so I
haven't gotten to this code this week.