most of #239 is in place now