I think it works.  Needs more testing (next week!).