Use GroupState properly.  Other notes.