first pass at #773