I had to change things to take advantage of one feature, but things should be working OK-ish at least for now.