Track MAC addresses of agents

And this is why we have code reviews, good point.  Withdrawn.