Merge Joe's stuff, manually