more work on obanyc-1987.  Still need unit test to prove this works