first pass at #186