nearly finished incorporating changes, except for the big one.