I did a poor job of merging stuff.