Work in refactoring and implementing user and group updating.