Thanks to Marsh Ray

Acknowledge Marsh Ray for feedback that led to important changes (which
if you’re confused, they haven’t been committed yet)