Upgrade Affected User Tracking

Initial work on upgrading affected user tracking.

Ping @MindscapeHQ/ruby-team, @armstrjare, @NZKoz, @CmdrKeen for feedback :)