merge the goodies i overwrote when matthew put commits on my branch