Refactored to stop newing up so manyPwGroups