:( Git did something stupid when I pulled and I wound up basing this off an earlier changeset. I'll redo it.