One last little bit of torturing myself over minutiae… I think it might finally be done.