nearing next ctp

Try to see if I can sneak this thru with a few less comments from the peanut gallery...