These are uncommitted changes from 11/2013.

I have no idea if they're any good.