Groomer update

NOT READY FOR MERGE
entiries -> entries