first pass at integrating Hurlbert issue #57