first pass at #421
Merge pull request #953 from NimbusBP1729/jim-costa

first pass at #421