Still working on making the list of groups more efficient