The first commit was a spike to get out of the weeds. This is a little tighter.