More work on organizations. Much work is needed in implementing and testing GroupRule changes