Fraudulent Activity Notifications XVII (refactor to a class)

Need to keep track of indexes as we swap them