getting my fork in sync.

This won't work because i@ and display names and all that... could easily be made to work using `material.name` though