I have most of this finished, but we had to defer it because there's still an issue with the tests I need to track down.