Cleaned up some commented code.  Retrieval of groups now working.