Merging new stuff, 12/4