Fixed which groups to display. Functionality almost complete\!