Did some organizing in anticipation of other work.