Groomer update

NOT READY FOR MERGE
Great catch.