Almost done with 22

At least, the first run through.