Cleaned up save context methods, cleaned up select group members implementation