Try #2 at checking all this in.