Recommit of Dave's stuff