Add Groups and fixup a bunch of junk