More changes
Working on the pending users feature.