Fixed Group D bug.  Got things ready for match saving.