Updated lots of functionality, added user-group-history
Revert "Updated lots of functionality, added user-group-history"

This reverts commit a78e805f9a1b0e5a3552f01d091f362dcb01fbc7.