A little more code cleanup. More progress toward #2 by developing basic ungrouping animation. Still more work needs to be done on the grouping and ungrouping animations for them to be robust.