first pass at #157

Look ok?